4d92c01933
Merge branch 'master' of https://github.com/assimp/assimp
2017-02-27 20:19:42 +01:00
7a47f1f8f7
Issue-1183: add stp to the list of supported extensions for step-files.
2017-02-27 20:11:59 +01:00
c3bb2b66ac
Merge pull request #1181 from assimp/issue_1169
...
Issue-1169: fix [] operator of vector3.
2017-02-21 17:29:49 +01:00
0f3731ab20
Issue-1169: add a unittest.
2017-02-21 17:12:22 +01:00
d43d9368f2
Issue-1169: fix travis build.
2017-02-21 11:17:09 +01:00
695439fad0
Issue-1169: fix [] operator of vector3.
2017-02-21 10:58:27 +01:00
2afeddd5cb
Merge pull request #1180 from JonAllee/Memory-Fix
...
Fix memory leak in Collada importer
2017-02-13 20:57:25 +01:00
5deb441a9c
Fix memory leak in Collada importer
...
Affects Collada files with morph Controller Elements.
2017-02-13 11:25:30 -08:00
a75fa44bde
PLY: prepare bugfix by adding missing unittest.
2017-02-11 14:19:34 +01:00
615bdb27d9
Closes https://github.com/assimp/assimp/issues/1102 : update Version.cpp
2017-02-11 13:49:48 +01:00
bf4f4d0730
closes https://github.com/assimp/assimp/issues/1102 : define line ending for missing files.
2017-02-11 13:48:39 +01:00
5073e41b8b
Closes //github.com/assimp/assimp/issues/1102: define line ending for CHANGES file.
2017-02-11 13:45:29 +01:00
8cda10a497
closes https://github.com/assimp/assimp/issues/1102 : update CHANGES file.
2017-02-11 13:44:17 +01:00
db1c6f5fc8
Update utObjImportExport.cpp
...
Unittest: make execution of base exporter test for obj depending of ASSIMP_BUILD_NO_EXPORT.
2017-02-06 13:15:53 +01:00
8a7e30b6a7
Update utObjImportExport.cpp
...
Unittest: Make obj-exporter test depending on export state.
2017-02-06 13:06:47 +01:00
95387298ab
Obj-Exporter test: fix test fixure if no export was requetsed.
2017-02-05 21:00:06 +01:00
da34ffd6ce
Fix the build: next try ( with full namespaces ).
2017-02-05 20:51:18 +01:00
6ed1f7570e
Merge branch 'master' of https://github.com/assimp/assimp
2017-02-05 19:30:11 +01:00
31bb9f7ba6
Obj: fix code review findings.
2017-02-04 18:32:04 +01:00
11e2ca173d
Fix the build.
2017-02-04 18:15:50 +01:00
692fb216f7
closes https://github.com/assimp/assimp/issues/809 : add vertex color
...
export support.
2017-02-04 14:51:23 +01:00
f9fa95a7c2
Obj-Importer: fix crash when updating the current mat-index: use correct
...
index.
2017-02-01 20:11:12 +01:00
bfb6eb317c
Merge pull request #1160 from NolaDonato/materialindex
...
OBJParser: set material index when changing current material
2017-02-01 18:42:16 +01:00
e28b5422e0
OBJ: check for null mesh before updating material index
...
Sometimes the current mesh is null, should check before updating the material index
Submitted by: Nola Donato nola.donato@samsung.com
2017-01-31 16:40:04 -08:00
cbaec4cae8
Merge pull request #1161 from NolaDonato/spacesinfilenames
...
OBJParser: Support spaces in texture file names
2017-01-31 08:40:36 +01:00
fc4243a08f
OBJParser: set material index when changing current material
...
When a new material is parsed from the material library, the name of the current material is set but the old material index remains. This leaves an incorrect material index in the current mesh causing textures to not be associated with the right mesh. This patch updates the material index when changing the material name.
submitted by: Nola Donato nola.donato@samsung.com
2017-01-30 20:32:37 -08:00
df5fc5f68d
OBJParser: Support spaces in texture file names
...
This patch allows embedded spaces in texture filenames found in MTL files. It only affects the OBJ parser.
Submitted by: Nola Donato nola.donato@samsung.com
2017-01-30 20:27:35 -08:00
a046268a67
Merge pull request #1159 from assimp/issues-1155
...
closes https://github.com/assimp/assimp/issues/1155 : remove deprecated
2017-01-30 12:52:01 +01:00
6cc3bb5024
closes https://github.com/assimp/assimp/issues/1155 : remove deprecated
...
workspaces.
2017-01-30 11:44:51 +01:00
28a78ca460
Merge pull request #1156 from elect86/patch-7
...
Update ColladaParser.cpp
2017-01-28 13:28:47 +01:00
16c50df071
Merge pull request #1154 from Kvalme/master
...
Fix for COLLADA export texture mapping #1084
2017-01-28 13:28:31 +01:00
e2e2d52d47
Merge pull request #1157 from elect86/patch-8
...
Update ColladaParser.cpp
2017-01-28 13:25:58 +01:00
ca47232101
Update ColladaParser.cpp
...
Fixed indent
2017-01-28 11:54:11 +01:00
c3c637be37
Update ColladaParser.cpp
2017-01-28 08:02:02 +01:00
9ca89808a9
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>
2017-01-27 14:31:07 +03:00
36e53b75fa
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>
2017-01-27 14:29:18 +03:00
d73a64b061
Merge remote-tracking branch 'upstream/master'
2017-01-27 10:57:32 +03:00
3e4a01ab04
Merge pull request #1150 from AntiMoron/master
...
Fix compiler cpp std version
2017-01-26 21:05:06 +01:00
696b6c1e97
Merge pull request #1152 from elect86/patch-6
...
Update ColladaParser.cpp
2017-01-26 21:04:14 +01:00
0434f5a5ff
Update ColladaParser.cpp
2017-01-26 17:29:31 +01:00
85e2788e50
Update ColladaParser.cpp
2017-01-26 17:28:39 +01:00
81741628a8
Fix cpp std version at least c++11
...
There's list loop enumeration and incompatible template codes which may cause compile errors due to different compilers.
2017-01-25 15:38:20 +08:00
0414b9c69d
Merge pull request #1147 from elect86/patch-5
...
Update PlyLoader.cpp, typo
2017-01-20 21:15:14 +01:00
3323d42ad6
Update PlyLoader.cpp
2017-01-20 19:30:36 +01:00
8748c6f4b6
Merge pull request #1146 from elect86/patch-4
...
Update PlyLoader.cpp
2017-01-20 00:08:06 +01:00
821e9fb0b8
Update PlyLoader.cpp
2017-01-19 22:43:38 +01:00
57975cb007
Merge pull request #1145 from elect86/patch-3
...
typo
2017-01-19 18:54:06 +01:00
82b1769759
Fix new call.
2017-01-19 13:38:06 +01:00
35b95ba710
API: Fix build
2017-01-19 11:41:43 +01:00
ebd04041ab
Merge branch 'master' of https://github.com/assimp/assimp
2017-01-19 11:19:02 +01:00
Kim Kulling
Kim Kulling
Kim Kulling
JonAllee
nola.donato@samsung.com
Alexander Gessler
Giuseppe Barbieri
Denis Biryukov
Denis Biryukov
AntiMoron