Commit Graph

6104 Commits (5b234924219d98f070aec079d8942d6deb6ec4f9)

Author SHA1 Message Date
Kim Kulling 45892d7fe9
Merge pull request #1898 from assimp/move_logtools
move log tools from blender to logger interface.
2018-04-12 22:00:28 +02:00
kimkulling e57394a772 move log tools from blender to logger interface. 2018-04-12 16:09:01 +02:00
Kim Kulling 9fd6744f93
Merge pull request #1884 from assimp/isue_1621
closes https://github.com/assimp/assimp/issues/1621: add file check f…
2018-04-12 00:29:15 +02:00
Kim Kulling 096f7e272a
Merge branch 'master' into isue_1621 2018-04-12 00:05:38 +02:00
Kim Kulling 42dcf8c14c Add missing test DXF-file. 2018-04-11 23:11:13 +02:00
Kim Kulling bb5607d1ae
Merge pull request #1896 from assimp/issue_1893
closes https://github.com/assimp/assimp/issues/1893: fix mem leak in …
2018-04-11 21:44:45 +02:00
Kim Kulling 5319974fe1 Use correct check to do a tokensearch. 2018-04-11 21:16:20 +02:00
Kim Kulling 0f9268bf01
Merge branch 'master' into issue_1893 2018-04-11 20:27:05 +02:00
Kim Kulling 2208a23410
Merge pull request #1895 from assimp/issue_1894
closes https://github.com/assimp/assimp/issues/1894: use mesh name to…
2018-04-11 20:26:53 +02:00
kimkulling da073f1270 closes https://github.com/assimp/assimp/issues/1893: fix mem leak in glft2Importer. 2018-04-11 17:22:31 +02:00
kimkulling 9ca32b2373 closes https://github.com/assimp/assimp/issues/1894: use mesh name to name exported obj node. 2018-04-11 17:04:49 +02:00
Kim Kulling 6a0dc071a9
Merge pull request #1887 from assimp/develop_kimkulling
add missing constructor to ensure RTTI
2018-04-08 23:59:21 +02:00
Kim Kulling b8a92a7e97
Merge branch 'master' into develop_kimkulling 2018-04-08 21:45:36 +02:00
Kim Kulling c41d459e21 add missing constructor to ensure RTTI 2018-04-08 21:27:18 +02:00
Kim Kulling 483541ee25
Merge branch 'master' into isue_1621 2018-04-06 20:54:01 +02:00
Kim Kulling 183224f045 closes https://github.com/assimp/assimp/issues/1621: add file check for dxf file without extensions. 2018-04-06 20:51:07 +02:00
Kim Kulling 4a645223f8
Merge pull request #1871 from assimp/develop_kimkulling
Add check for SSE2-support.
2018-04-06 18:49:21 +02:00
Kim Kulling 44c62042f3
Merge branch 'master' into develop_kimkulling 2018-04-06 18:13:04 +02:00
Kim Kulling 0a3fb04b04
Update ScenePrivate.h
add missing header
2018-04-06 16:23:59 +02:00
Kim Kulling c269e9329e
Merge pull request #1882 from assimp/issue_1881
closes https://github.com/assimp/assimp/issues/1881: make template-ba…
2018-04-06 13:01:05 +02:00
Kim Kulling 3bd80a2537 closes https://github.com/assimp/assimp/issues/1881: make template-based get and put in streamreader/writer public. 2018-04-06 12:05:30 +02:00
Kim Kulling 32b466941b Add missig docs and fix some small review findings. 2018-04-06 12:01:22 +02:00
Kim Kulling d17cf76c85 Fix compiler warning in unit test: unused variable. 2018-04-06 11:16:52 +02:00
Kim Kulling 08ddd5c296 Export missig symbols. 2018-04-06 10:53:32 +02:00
Kim Kulling a636146cf2 Merge branch 'master' into develop_kimkulling 2018-04-06 10:34:46 +02:00
Kim Kulling 5fbffd394e
Merge pull request #1868 from EdwardAndrew/issue-1219
Fixed issue#1219. CalcTangentsProcess::ProcessMesh.
2018-04-06 10:33:42 +02:00
Kim Kulling a3cb1ef55e Merge branch 'master' into develop_kimkulling 2018-04-06 10:32:35 +02:00
Kim Kulling 40f5f19ce0
Merge branch 'master' into issue-1219 2018-04-05 15:24:40 +02:00
Kim Kulling 6403dc8012
Merge pull request #1879 from DMJC/master
Updated GLView to draw with white lighting after drawCoordSystem().
2018-04-05 15:24:01 +02:00
James Carthew 8cb25328cb committing all changes. 2018-04-05 17:50:30 +10:00
James Carthew 4254142575 Updated GLView to draw with white lighting after drawCoordSystem(). 2018-04-05 06:37:18 +10:00
Edward Andrew b8025d92fc
Merge branch 'master' into issue-1219 2018-04-04 21:12:52 +01:00
Kim Kulling 0e945b5581 Merge branch 'master' into develop_kimkulling 2018-04-04 16:32:46 +02:00
Kim Kulling c232c4bfb3 Add missing file to fix the build. 2018-04-04 16:32:18 +02:00
Kim Kulling 24880740aa
Merge pull request #1876 from DMJC/master
Updated COB importer plugin to flip normals.
2018-04-04 16:30:42 +02:00
James Carthew 6147a4f50d Updated COB importer plugin to flip normals. 2018-04-04 08:08:28 +10:00
Kim Kulling 06579e87f7
Merge pull request #1872 from asmaloney/asm_master
Add links to some file format info in readme
2018-04-03 09:58:35 +02:00
Andy Maloney 7faf638cca Add links to some file format info in readme 2018-04-02 14:41:02 -04:00
Edward Andrew 0c035f131d
Merge branch 'master' into issue-1219 2018-04-02 14:39:13 +01:00
Kim Kulling 4d662c42b3 Add check for SSE2-support. 2018-04-02 10:27:05 +02:00
Kim Kulling 00e2e60b67
Merge pull request #1860 from wanadev/gltf2-duplicated-textures
[glTF2] Not duplicating embedded textures
2018-04-02 10:24:34 +02:00
Edward Andrew 35f4e7101a Fixed issue#1219. CalcTangentsProcess::ProcessMesh. 2018-04-02 01:46:14 +01:00
Kim Kulling c24c1a7802
Merge branch 'master' into gltf2-duplicated-textures 2018-04-01 19:48:50 +02:00
Kim Kulling 61fe3e52ce
Merge pull request #1867 from assimp/issue_1831
closes https://github.com/assimp/assimp/issues/1831: make config CMAK…
2018-04-01 19:25:36 +02:00
A. Breust 0624eb0e08
Merge branch 'master' into gltf2-duplicated-textures 2018-04-01 18:09:14 +02:00
Kim Kulling c4f5377793
Merge branch 'master' into issue_1831 2018-04-01 17:43:48 +02:00
Kim Kulling c7a683ddaf
Merge pull request #1858 from mesilliac/fbx_export_ascii
Ascii FBX Export
2018-04-01 17:43:24 +02:00
Kim Kulling 04c65ccdcb closes https://github.com/assimp/assimp/issues/1831: make config CMAKE_LIBRARY_CONFIG overridable. 2018-04-01 17:16:14 +02:00
Kim Kulling d17047cfd1
Merge branch 'master' into fbx_export_ascii 2018-04-01 17:00:42 +02:00
Kim Kulling b9b433d47b
Merge pull request #1865 from assimp/develop_kimkulling
Develop kimkulling
2018-04-01 17:00:28 +02:00