d2499ac197
Update CMakeLists.txt
...
Linke irrXml static for apple
2020-04-10 12:52:54 +02:00
872001c1c9
Merge branch 'master' into sample-simpletextureddirectx11-nullptr
2020-04-10 12:29:51 +02:00
9b671c6eb4
Update CMakeLists.txt
...
Add explicit linking of irrxml.
2020-04-10 12:27:40 +02:00
a14b5fb06f
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-10 08:44:19 +01:00
485d7ab52e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-10 08:44:18 +01:00
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
3d95e75774
Merge pull request #3141 from malortie/sample-simpletexturedogl-nullptr
...
Replaced NULL with nullptr for pointers in sample SimpleTexturedOpenGL.
2020-04-08 22:13:50 +02:00
909a838ea8
Merge branch 'master' into sample-simpletexturedogl-nullptr
2020-04-08 20:53:25 +02:00
bb7212c46a
Merge pull request #3139 from malortie/assimp-viewer-nullptr
...
Replaced NULL with nullptr for pointers in Assimp viewer.
2020-04-08 20:52:43 +02:00
c6045438dc
Merge branch 'master' into assimp-viewer-nullptr
2020-04-08 20:17:37 +02:00
592e71dd7e
Replaced NULL with nullptr for pointers in sample SimpleTexturedOpenGL.
2020-04-07 16:43:36 -04:00
abb628bc58
Merge pull request #3125 from malortie/fix-sample-simpletexturedogl-w4-compile-warnings
...
Fixed /W4 compile warnings in sample SimpleTexturedOpenGL.
2020-04-07 20:43:04 +02:00
d0e14e4140
Merge branch 'master' into fix-sample-simpletexturedogl-w4-compile-warnings
2020-04-07 18:47:32 +02:00
3510d85967
Replaced NULL with nullptr for pointers in Assimp viewer.
2020-04-07 10:56:22 -04:00
b59e6a2df4
Merge pull request #3129 from malortie/fix-assimp-viewer-w4-compile-warnings
...
Fixed /W4 compile warnings in Assimp viewer.
2020-04-07 11:25:28 +02:00
c79c6f5ae7
Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings
2020-04-07 11:09:25 +02:00
0f3b196afc
Merge pull request #3126 from vmatare/master
...
use GNUInstallDirs where possible (master branch)
2020-04-07 11:08:55 +02:00
06f148defc
Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings
2020-04-06 20:59:36 +02:00
09eba0f039
Merge branch 'master' into master
2020-04-06 20:42:41 +02:00
4eb129fa6d
Merge pull request #3137 from assimp/issue_2166
...
closes https://github.com/assimp/assimp/issues/2166 :
2020-04-06 20:42:08 +02:00
9a11d91cb8
code reformattings.
2020-04-06 13:33:03 +02:00
131aed73b0
closes https://github.com/assimp/assimp/issues/2166 : add missing setter for metadata.
2020-04-06 11:16:16 +02:00
105b2bdeaf
Replaced NULL with nullptr for pointers in sample SimpleTexturedDirectx11.
2020-04-04 15:37:50 -04:00
132ecae6f4
Merge branch 'master' into kimkulling_dev
2020-04-04 18:28:50 +02:00
a73fd6c84c
Update MessageProc.cpp
...
I guess Turol meant this change.
2020-04-04 18:24:19 +02:00
1b0a0675dc
Applied review requested changes - renamed _data to data.
2020-04-04 10:32:29 -04:00
1cb564aa4b
Fixed /W4 compile warnings in Assimp viewer.
2020-04-03 14:36:44 -04:00
732dc6a5d6
Merge branch 'master' into fix-sample-simpletexturedogl-w4-compile-warnings
2020-04-03 14:15:31 -04:00
085212e58a
Merge pull request #3127 from malortie/fix-sample-simpletextureddirectx11-w4-compile-warnings
...
Fixed /W4 compile warnings in sample SimpleTexturedDirectx11.
2020-04-03 18:56:34 +02:00
4bae1d2596
Fixed warning C4018: '<': signed/unsigned mismatch
2020-04-03 10:07:44 -04:00
e67ddd0ca1
Fixed /W4 compile warnings in sample SimpleTexturedDirectx11.
2020-04-03 09:43:01 -04:00
fa9ccfba61
Applied review requested changes for #3125
...
- Reverted stb_image.h changes to prevent future merge conflicts.
- Added #pragma warning before and after stb_image header to disable and enable 'unreferenced formal parameter' warning.
2020-04-03 07:50:07 -04:00
a07bf8b26f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-03 08:40:32 +01:00
d966f3394b
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-03 08:40:29 +01:00
9fb81c3be6
use GNUInstallDirs where possible
...
Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and
disable redefining FHS-mandated install locations via user-editable
ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary,
Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables.
2020-04-03 00:44:44 +02:00
895675535a
Fixed /W4 compile warnings in sample SimpleTexturedOpenGL.
2020-04-02 15:28:06 -04:00
6b68c0ee45
Merge pull request #3124 from malortie/fix-sample-simpleogl-w4-compile-warnings
...
Fixed /W4 compile warnings in sample SimpleOpenGL.
2020-04-02 21:02:14 +02:00
c0273a2bb4
Merge branch 'master' into fix-sample-simpleogl-w4-compile-warnings
2020-04-02 14:43:24 -04:00
210f40e984
Merge pull request #3113 from thomasbiang/assimp_gltf2_exporter
...
Fix gltf2 exporter memory crash
2020-04-02 20:39:59 +02:00
56e2f2e37e
Fixed /W4 compile warnings in sample SimpleOpenGL.
2020-04-02 14:19:16 -04:00
9511976485
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-02 08:08:13 +01:00
e61cb1794f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-02 08:08:08 +01:00
c21a1ffffa
Remove comments to increase readability
2020-04-01 11:16:39 +02:00
750bd93eb3
Merge branch 'master' into optimized_bonelimits
2020-04-01 11:04:54 +03:00
a7208b02e0
Merge branch 'master' into assimp_gltf2_exporter
2020-04-01 08:42:48 +02:00
bfedc05045
Merge pull request #3117 from malortie/remove-unneeded-headers
...
Removed unneeded SceneDiffer.h includes.
2020-04-01 08:35:40 +02:00
06e40b9820
Removed unneeded SceneDiffer.h includes.
2020-03-31 17:22:56 -04:00
8bd8a3ced3
Merge branch 'master' into kimkulling_dev
2020-03-31 22:03:27 +02:00
0af06d3f0c
Merge pull request #3114 from assimp/kimkulling-patch-5
...
Fix funding
2020-03-31 20:17:56 +02:00
323686f878
Fix funding
2020-03-31 19:59:02 +02:00
Kim Kulling
Max Vollmer (Microsoft Havok)
Marc-Antoine Lortie
Kim Kulling
Marc-Antoine Lortie
Victor Mataré
Ville Ruusutie
Marc-Antoine Lortie