Commit Graph

1664 Commits

Author SHA1 Message Date
Jan Möbius
cbfc676c92 Merge branch 'warning' into 'master'
Fix undefined MSVC macro warning



See merge request !80
2016-08-15 10:59:35 +02:00
Jan Möbius
fc309bd690 Fixed changelog 2016-08-15 10:37:10 +02:00
Jan Möbius
b64ef6b56d Updated changelog 2016-08-15 10:34:52 +02:00
Alexander Dielen
c8c51626df Added link directories and log file. 2016-08-14 13:22:18 +02:00
xan
6f811b5bd9 No Core/src include directory 2016-08-14 09:25:03 +02:00
xan
8445bad3c3 Fix undefined MSVC macro warning 2016-08-14 09:21:31 +02:00
Jan Möbius
1a96ae05f0 Merge branch 'circulator-gcc6-fix' into 'master'
fix CirculatorT type-pun warning on GCC6

fixes #28

See merge request !78
2016-08-11 12:12:47 +02:00
Janis Born
5ee25a5af0 fix CirculatorT type-pun warning on GCC6
(fixes #28)
2016-08-11 10:22:44 +02:00
Jan Möbius
cb5bc2b2b4 Merge branch 'fixhash' into 'master'
changed incorrect class into struct



See merge request !77
2016-08-03 12:57:36 +02:00
David Bommes
b82e329c21 changed incorrect class into struct 2016-08-03 10:07:28 +02:00
Jan Möbius
4f5e58b682 Merge branch 'decimater-documentation' into 'master'
document that DecimaterT::decimate does not perform garbage collection on the mesh

addressing #27 

See merge request !76
2016-07-25 08:18:42 +02:00
Janis Born
e029d33c2a document that DecimaterT::decimate does not perform garbage collection on the mesh 2016-07-22 16:34:39 +02:00
Jan Möbius
c9510459ca Bump version to 6.3 development 2016-07-11 16:23:12 +02:00
Jan Möbius
00b7d518f5 Fixbundle will only be called when apps are build. Remove if clause which is unnecessary 2016-07-11 12:37:27 +02:00
Jan Möbius
6f862cad6c Merge branch 'hash_functions' into 'master'
Hash functions



See merge request !75
2016-07-11 10:24:44 +02:00
Jan Möbius
c2d7bf9868 Updated changelog for release 2016-07-11 09:24:54 +02:00
Jan Möbius
8b71dd6702 Dont force cmake configuration types 2016-07-06 08:31:54 +02:00
Jan Möbius
bfd99a11c3 Fixed changelog typo 2016-06-30 14:33:53 +02:00
Jan Möbius
c4e2d27d33 Merge branch 'VS2015_Update3' into 'master'
Vs2015 update3



See merge request !74
2016-06-30 14:26:35 +02:00
Jan Möbius
59c0b6f16b Next try 2016-06-30 14:05:25 +02:00
Jan Möbius
085e711856 Fixed VS2015 Update 3 fix 2016-06-30 13:56:54 +02:00
Jan Möbius
755f06bf11 Fixed VS2015 Update 3 build error. (Thanks to Jeongkyu Kim for the patch) 2016-06-30 13:53:23 +02:00
Jan Möbius
658632d83a Updated changelog 2016-06-30 13:14:06 +02:00
Martin Schultz
80192d945b added code to write faceTexCoords to obj writer.
fixes #25
2016-06-29 16:58:59 +02:00
Jan Möbius
5ed8f3c053 Merge branch 'patch-1' into 'master'
Split openmeshcore static/shared MinGW compilation

As with ms compilers, the shared/static compilation depends on export macros.

Besides this is inconsistent with the behavior for openmeshtools library.

Why did you add this ?

See merge request !72
2016-06-15 23:15:14 +02:00
xan
ecdd59a82a Split openmeshcore static/shared MinGW compilation
As with ms compilers, the shared/static compilation depends on export macros.
Anyway this is inconsistent with the behavior for openmeshtools library.

Why did you add this ?
2016-06-15 21:19:22 +02:00
Andreas Fabri
58b9e4085a - ADD a macro OM_HAS_HASH in the config file.
- Based on the macro provide partial specializations for std::hash<>
- for vertex,halfede,edge, and face handles.
- Add a free function hash_value(BaseHandle) for boost::unordered_set/map
2016-06-08 10:29:18 +02:00
Jan Möbius
7a547cb759 Updated changelog 2016-06-07 12:58:40 +02:00
Jan Möbius
8a26487a69 Added hash functions 2016-06-07 12:56:27 +02:00
Jan Möbius
46aed2c4f4 Bump version number for 6.2 development cycle 2016-05-31 12:56:24 +02:00
Jan Möbius
16a6a6b607 Merge branch 'MINGW_changes' into 'master'
Mingw changes

TODO: Test 

See merge request !68
2016-05-31 12:23:33 +02:00
Jan Möbius
279659856a More MINGW compatibility changes
(cherry picked from commit ec84b4750a)
2016-05-31 12:22:04 +02:00
Jan Möbius
27b9cf584f Updated changelog
(cherry picked from commit a564a30c36)
2016-05-31 12:21:05 +02:00
Jan Möbius
05f2e1fa7a Set policy 2016-05-30 16:57:55 +02:00
Jan Möbius
984239ade2 Merge branch 'PLY_READER_handle_rn_newlines' into 'master'
Handle nr newlines



See merge request !71
2016-05-30 16:31:05 +02:00
Jan Möbius
2e5de79b70 Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh 2016-05-30 16:29:43 +02:00
Jan Möbius
fe07bd72eb Typo for apps 2016-05-30 16:29:37 +02:00
Jan Möbius
1ab77e166b Merge branch 'Throw_error_when_no_readers_are_available' into 'master'
Throw error when no readers are available



See merge request !69
2016-05-30 16:27:53 +02:00
Jan Möbius
ec84b4750a More MINGW compatibility changes 2016-05-30 16:26:01 +02:00
Jan Möbius
2822bb61a3 Add plain stl extension to stlwriter 2016-05-30 16:19:55 +02:00
Jan Möbius
0c39868e52 Merge branch 'Disable_bundle_fix_without_apps' into 'master'
Convert 2 unix



See merge request !70
2016-05-30 16:15:17 +02:00
Jan Möbius
b4cea6008d Handle nr newlines 2016-05-30 16:12:38 +02:00
Jan Möbius
c8ad04b734 Updated changelog 2016-05-30 16:06:50 +02:00
Jan Möbius
5903657e6a Throw error when no readers are available 2016-05-30 14:07:11 +02:00
Jan Möbius
5c7bdde200 Convert 2 unix 2016-05-30 14:04:28 +02:00
Jan Möbius
ec12932e73 Updated changelog 2016-05-30 14:02:35 +02:00
Jan Möbius
b2f3d5eac4 Several changes to make Mingw happy 2016-05-30 14:00:43 +02:00
Jan Möbius
a564a30c36 Updated changelog 2016-05-30 13:51:08 +02:00
Jan Möbius
91ee22ca2f Merge branch 'fixMSVC2015Community' into 'master'
fixes MSVC Community 2015 ICE

The default constructors are now used as template specializations by
postponing them below the template definition

See merge request !67
2016-05-24 15:15:59 +02:00
Martin Schultz
4b8f1bf667 fixes MSVC Community 2015 ICE
The default constructors are now used as template specializations by
postponing them below the template definition
2016-05-24 15:06:32 +02:00