Commit Graph

4696 Commits (b7f1277175236b6ce935b9ca9cc2b210b47905b3)

Author SHA1 Message Date
Kim Kulling f3407ef804 aiMetaData: introduce aiMetaData::Dealloc. 2017-05-25 22:35:27 +02:00
Kim Kulling fb33199d99 GLTFImporter: exclude headers from build whem no_glft_importer is
defined.
2017-05-25 22:34:45 +02:00
Kim Kulling b7d4b69e0d X3DImporter: fix the build. 2017-05-24 22:35:35 +02:00
Kim Kulling 3c370c83b9 MDLImporter: remove dead code. 2017-05-24 21:18:51 +02:00
Kim Kulling 18b0316d52 X3DImporter: fix coverity finding ( missing comma ). 2017-05-24 21:15:55 +02:00
Kim Kulling ec496a5833 X3DImporter: fix coverity finding. 2017-05-24 21:04:35 +02:00
rdb 9eb0a3f3d5 Fix error when custom CMAKE_C_FLAGS is specified 2017-05-23 15:34:02 +02:00
Kim Kulling 1bfff8ba1d ObjImporter: Add unittest. 2017-05-22 21:11:01 +02:00
Kim Kulling b84de79219 Merge pull request #1279 from Squareys/update-docs
Update docs (Logging, Preamble Copyright and embedded Textures)
2017-05-20 20:45:26 +02:00
Kim Kulling 3d5e94477f Merge pull request #1272 from assimp/issue-1262
closes https://github.com/assimp/assimp/issues/1262: fix .
2017-05-19 23:13:40 +02:00
Kim Kulling badd8cb6a4 OpenGEX: fix lowercase typo for linux. 2017-05-19 23:00:57 +02:00
Squareys 4e1ea6ecd7 docs: Explain texture paths for embedded textures 2017-05-19 13:32:04 +02:00
Squareys efeeb6a827 docs: Update logging docs 2017-05-19 13:32:04 +02:00
Squareys aab36ca723 docs: Update copyright notice in preamble 2017-05-19 13:32:04 +02:00
Kim Kulling febf94f6aa Merge pull request #1212 from aoowweenn/umw_dev
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
Kim Kulling eba06f0c8b Merge pull request #1275 from ab4d/master
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-17 11:34:35 +02:00
Kim Kulling 1daad40b30 Merge branch 'master' into issue-1262 2017-05-17 10:20:45 +02:00
Kim Kulling 04f908aa4c Obj-Exporter: fix build. 2017-05-17 10:13:07 +02:00
Kim Kulling 60c54cbf59 Merge branch 'master' of https://github.com/assimp/assimp 2017-05-17 09:25:30 +02:00
Kim Kulling 2f649833d5 LWOLoader: fix link in loader description. 2017-05-17 09:25:07 +02:00
Andrej 331bbacf3d Fixed build error in ObjExporter :: GetMaterialLibFileName 2017-05-16 22:18:47 +02:00
Kim Kulling 2b785e4e81 Merge pull request #1274 from ab4d/master
Improved obj exporter to export materials to fileName.mtl file instead of fileName.obj.mtl
2017-05-16 22:09:59 +02:00
Andrej 2b89a3cffc Using single quote for one character parameter in find_last_of method call 2017-05-16 21:56:49 +02:00
Kim Kulling 3f68278ea0 Merge branch 'master' into issue-1262 2017-05-16 21:53:35 +02:00
Kim Kulling 6c70edaf28 build: add missing files. 2017-05-16 21:46:04 +02:00
Kim Kulling a45b5cdfb5 OpenGEX: fix invalid handling with color4 token. 2017-05-16 21:45:23 +02:00
Kim Kulling 542fe31a94 closes https://github.com/assimp/assimp/issues/1262: fix . 2017-05-16 21:07:20 +02:00
Andrej c3974512e4 Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl 2017-05-16 15:55:40 +02:00
Andrej 04dbdca329 Revert "Creating fileName.mtl file instead of fileName.obj.mtl"
This reverts commit 5757980ea5.
2017-05-16 15:47:57 +02:00
Andrej 5757980ea5 Creating fileName.mtl file instead of fileName.obj.mtl 2017-05-16 15:34:50 +02:00
Kim Kulling ff7624f06f Merge pull request #1268 from VennGrayDog/b1
Add TokensForSearch in BlenderLoader
2017-05-15 21:37:26 +02:00
Kim Kulling 7e011c92f0 Merge pull request #1269 from assimp/issue_1266
closes https://github.com/assimp/assimp/issues/1266: fix wrong delete
2017-05-15 21:33:42 +02:00
Kim Kulling 0c3a145729 issue-1266: add unittest for it. 2017-05-15 21:18:34 +02:00
Kim Kulling 428a4cdd71 SpatialSort: use std::vector::clear(). 2017-05-15 19:41:08 +02:00
Kim Kulling e5657bf0c5 closes https://github.com/assimp/assimp/issues/1266: fix wrong delete
Instead of delete delete [] must be used.
2017-05-15 09:55:39 +02:00
Alexander Gessler ab45dc79fa Merge pull request #1263 from jamesgk/gltf-export
GLTF exporter: convert animation time from ticks to seconds
2017-05-15 09:12:57 +02:00
VennGrayDog 0b34089df0 Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files. 2017-05-15 02:34:53 -04:00
Alexander Gessler 24790398b9 Merge pull request #1264 from smokris/master
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'
2017-05-15 00:39:36 +02:00
Alexander Gessler cd7cc2e58c Merge pull request #1267 from VennGrayDog/b1
Fix location of config.h
2017-05-15 00:39:05 +02:00
VennGrayDog 3d05df2d3e Fix location of config.h 2017-05-14 15:09:31 -04:00
Steve Mokris 2e455b78c8 Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'. 2017-05-11 15:21:37 -04:00
jamesgk c33039d682 GLTF exporter: convert animation time from ticks to seconds 2017-05-11 11:04:23 -07:00
Kim Kulling 9b2671b280 Merge pull request #1248 from NcJie/fixed-android-atof-not-found-issue
Fixed no member named 'atop' in global namespace issue for Android ND…
2017-05-11 10:55:59 +02:00
Kim Kulling ab19c5e3f7 Merge pull request #1258 from jamesgk/gltf-export
GLTF exporter: ensure animation accessors have same count
2017-05-11 10:46:06 +02:00
Kim Kulling f6a8be5bac AMPImporter: fix coverity findings. 2017-05-10 19:34:50 +02:00
Kim Kulling 5411f769e8 STEPFile: fix coverity findings. 2017-05-10 18:50:51 +02:00
Kim Kulling d36fbfbb8b Merge branch 'master' of https://github.com/assimp/assimp 2017-05-10 18:30:36 +02:00
Kim Kulling 0300574b8b AMFImporter: fix coverity findings. 2017-05-10 18:29:42 +02:00
Kim Kulling b8747fffca Merge pull request #1259 from Squareys/fix-cmake-install
[One-Line-Change] Fix config.h not being found during cmake --build . --target install
2017-05-10 09:37:04 +02:00
Kim Kulling 9ef1a4fae0 X3D: fix coverity findings. 2017-05-09 22:54:04 +02:00