3f68278ea0
Merge branch 'master' into issue-1262
2017-05-16 21:53:35 +02:00
6c70edaf28
build: add missing files.
2017-05-16 21:46:04 +02:00
a45b5cdfb5
OpenGEX: fix invalid handling with color4 token.
2017-05-16 21:45:23 +02:00
542fe31a94
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-16 21:07:20 +02:00
c3974512e4
Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl
2017-05-16 15:55:40 +02:00
04dbdca329
Revert "Creating fileName.mtl file instead of fileName.obj.mtl"
...
This reverts commit 5757980ea5
2017-05-16 15:47:57 +02:00
5757980ea5
Creating fileName.mtl file instead of fileName.obj.mtl
2017-05-16 15:34:50 +02:00
ff7624f06f
Merge pull request #1268 from VennGrayDog/b1
...
Add TokensForSearch in BlenderLoader
2017-05-15 21:37:26 +02:00
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
0c3a145729
issue-1266: add unittest for it.
2017-05-15 21:18:34 +02:00
428a4cdd71
SpatialSort: use std::vector::clear().
2017-05-15 19:41:08 +02:00
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
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
0b34089df0
Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files.
2017-05-15 02:34:53 -04:00
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
cd7cc2e58c
Merge pull request #1267 from VennGrayDog/b1
...
Fix location of config.h
2017-05-15 00:39:05 +02:00
3d05df2d3e
Fix location of config.h
2017-05-14 15:09:31 -04:00
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
c33039d682
GLTF exporter: convert animation time from ticks to seconds
2017-05-11 11:04:23 -07:00
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
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
f6a8be5bac
AMPImporter: fix coverity findings.
2017-05-10 19:34:50 +02:00
5411f769e8
STEPFile: fix coverity findings.
2017-05-10 18:50:51 +02:00
d36fbfbb8b
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-10 18:30:36 +02:00
0300574b8b
AMFImporter: fix coverity findings.
2017-05-10 18:29:42 +02:00
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
9ef1a4fae0
X3D: fix coverity findings.
2017-05-09 22:54:04 +02:00
cfb867b5e7
Fix config.h not being found during install
2017-05-09 21:51:49 +02:00
eb828a3b71
X3DImporter: fix coverity findings.
2017-05-09 21:35:21 +02:00
4a5c483ac4
AMFImporter: make test against nullptr dereferencing meaningful.
2017-05-09 21:03:20 +02:00
f77e27ca19
ColladaExporter: remove self assignment.
2017-05-09 20:59:01 +02:00
03d97b23ec
Coverity: fix finding in COBLoader.
2017-05-09 20:15:30 +02:00
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
36f4fb8826
GLTF exporter: ensure animation accessors have same count
2017-05-08 14:45:26 -07:00
186629b372
SpatialSort: use std::vector::resize( 0 ) to improve readability.
2017-05-08 21:57:08 +02:00
65653edf88
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-08 21:29:07 +02:00
5289954e27
Fix review findings.
2017-05-06 20:57:17 +02:00
98100d8cab
Blender-Importer: fix coverity findings.
2017-05-06 11:14:04 +02:00
d02a4c36a9
Mesh: fix coverity finding.
2017-05-06 11:08:57 +02:00
c1b56715fe
Mesh: fix coverity bug.
2017-05-06 11:04:40 +02:00
39e048dea6
Merge pull request #1254 from samitc/master
...
Improve performance of obj line break
2017-05-04 19:53:51 +02:00
7f014ea889
Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri
...
Fix incorrect truncation of binary URI in glTF exporter
2017-05-04 19:52:18 +02:00
d6e8fd34f0
Search for .gltf extension at end of file name for buffer prefix.
...
Previously the code assumed that there would be only one '.' in the file
name, which is not a valid assumption. This patch fixes this issue, but
still assumes that the only occurrence of the string ".gltf" is at the
end of the file name. In particular, it will fail on a file name like
"/path/to/a.gltf/my_gltf.wrong_extension".
2017-05-03 15:11:31 -04:00
82e213fb7c
Merge pull request #1252 from a-day-old-bagel/master
...
Shouldn't the configured "config.h" file be going into the binary directory?
2017-05-02 20:07:08 +02:00
e21c1a8ec4
Merge pull request #1255 from heliocastro/fpic_fix
...
Add missing CFLAGS -fPIC.
2017-05-02 20:06:08 +02:00
0c4c1270ac
Add missing CFLAGS -fPIC.
...
This entry was missing due revert of CMAKE_POSITION_INDEPENDENT_CODE
usage. Reported by @Sailsman63
2017-05-02 16:48:49 +02:00
b93df233e3
Merge pull request #1253 from rdb/master
...
Fix static init ordering bug in OpenGEX importer
2017-05-02 11:03:59 +02:00
dd1d10407e
make array non static to support multithreaded
2017-05-01 16:54:07 +03:00
8b4e066ca5
Improve performance of obj line break
2017-05-01 16:32:49 +03:00
0069552183
Fix static init ordering bug in OpenGEX importer
2017-05-01 15:11:22 +02:00
Kim Kulling
Kim Kulling
Andrej
Alexander Gessler
VennGrayDog
Steve Mokris
jamesgk
Kim Kulling
Squareys
John Senneker
Helio Chissini de Castro
Amit Cirt
rdb