718d325b7c
Merge branch 'master' into warning-level-max
2019-11-21 12:15:33 +11:00
97dc0ce15d
Added CMake option to set the compiler warning to max (-Wall /W4). Off by default
2019-11-21 12:04:53 +11:00
fea84aaba3
Merge pull request #2771 from assimp/kimkullig_dev
...
closes https://github.com/assimp/assimp/issues/2733 : update of zlip t…
2019-11-20 20:53:06 +01:00
f78446b14a
closes https://github.com/assimp/assimp/issues/2733 : update of zlip to fix gcc build for v9.2.0 32 bit
2019-11-19 20:30:40 +01:00
8ca476954a
Merge pull request #2748 from thewoz/master
...
Update .gitignore
2019-11-19 20:13:00 +01:00
abdbecfca2
Merge branch 'master' into master
2019-11-19 16:29:59 +01:00
f0358fbe84
Merge pull request #2764 from assimp/kimkullig_dev
...
Kimkullig dev
2019-11-19 00:39:01 +01:00
7e222f0730
fix invalid cast.
2019-11-18 18:43:28 +01:00
75204e20bd
fix invalid setup for texture enum.
2019-11-16 19:22:37 +01:00
17257cd2ae
just a try, i dunno have a clue ...
2019-11-16 15:51:26 +01:00
2eed8b1820
TextureTransform: set material transform only when the extension is provided.
2019-11-16 08:08:57 +01:00
4ad2368116
disable samples per default.
2019-11-15 21:46:09 +01:00
3a8cb442f3
closes https://github.com/assimp/assimp/issues/2681 : add dx11-sample to cmake.
2019-11-15 20:52:13 +01:00
9493ec670d
Merge branch 'kimkullig_dev' of https://github.com/assimp/assimp into kimkullig_dev
2019-11-15 19:39:14 +01:00
a8182d86cb
fix initialization + some vs2019 compiler warnings.
2019-11-15 19:38:37 +01:00
13a4619817
Merge branch 'master' into kimkullig_dev
2019-11-15 18:52:04 +01:00
17946e26ef
add missing setup of texture transform in aiMaterial.
2019-11-15 18:35:33 +01:00
74080a083a
add texture-transfrm unittest.
2019-11-14 21:15:30 +01:00
04db5cd5ea
closes https://github.com/assimp/assimp/issues/2119 : initial version.
2019-11-14 21:11:53 +01:00
a9f82dbe0b
Merge pull request #2758 from jcarpent/topic/c++11
...
BUG - use noexcept only for C++11 and more
2019-11-12 18:49:33 +01:00
28a9fb31fd
Merge branch 'master' into topic/c++11
2019-11-10 13:20:05 +01:00
d5ac333005
Merge pull request #2759 from assimp/kimkullig_dev
...
closes https://github.com/assimp/assimp/issues/1320 : make sure build …
2019-11-10 12:08:05 +01:00
73274316be
Merge remote-tracking branch 'upstream/master'
2019-11-10 11:50:38 +01:00
aa25c815bd
closes https://github.com/assimp/assimp/issues/1320 : make sure build works with all exporter disabled.
2019-11-10 09:47:50 +01:00
031d3b648e
defs: use noexcept only for C++11 and more
2019-11-10 08:23:17 +01:00
595f937ff9
Merge pull request #2757 from assimp/kimkullig_dev
...
closes https://github.com/assimp/assimp/issues/2684 : normalize path
2019-11-09 17:55:11 +01:00
58729b1b3d
fix debug-target.
2019-11-09 11:28:56 +01:00
b63285f9ad
closes https://github.com/assimp/assimp/issues/2684 : normalize path
2019-11-09 11:12:47 +01:00
78ec42fc17
Merge pull request #2751 from muxanickms/export_fbx_bigger_than_2GB_fix
...
Fix for exporting fbx bigger than 2GB
2019-11-05 21:54:55 +01:00
adec426b7c
Fix for exporting fbx bigger than 2GB
2019-11-05 17:11:56 +00:00
c890a4d521
Update .gitignore
2019-11-05 16:36:03 +01:00
308db73d0b
Merge pull request #2736 from bztsrc/master
...
Added M3D format support
2019-11-04 22:18:08 +01:00
d29185ec7d
Merge branch 'master' into master
2019-11-03 21:22:01 +01:00
1aaec5ea7b
Merge pull request #2728 from RevoluPowered/feature/clang-formatting
...
Clang format added for code reformatting
2019-11-03 21:03:58 +01:00
2e84f5174d
Merge branch 'master' into feature/clang-formatting
2019-11-03 10:33:17 +01:00
ef06cabe6c
Merge pull request #2741 from muxanickms/fbx_orphant_embedded_textures
...
FBX orphan embedded textures fix
2019-11-03 10:32:17 +01:00
c49e67ee1e
Merge branch 'master' into master
2019-11-02 15:53:33 +01:00
df30c83db4
Merge branch 'master' into fbx_orphant_embedded_textures
2019-11-02 15:10:32 +01:00
d518950e80
Merge pull request #2744 from tanolino/patch-1
...
Update CXMLReaderImpl.h
2019-11-02 15:09:57 +01:00
dda46f5f4d
Merge branch 'master' into master
2019-11-02 01:14:04 +01:00
7201ebdccc
Make Clang happy
2019-11-01 21:52:11 +01:00
7d9e9aadbb
Asked modifications and unit test
2019-11-01 17:21:24 +01:00
82f926971b
Update CXMLReaderImpl.h
...
Issues with German locale number converter expecting German numbers.
In Germany we have numbers like #,## instead of #.## . Thus a unit conversion in COLLADA of 0.01 (centimeter) turned out to be 0.00.
2019-11-01 17:01:52 +01:00
536fea1c8d
operator less for old compilers
2019-11-01 14:50:30 +00:00
55c2a3edb9
FBX orphant embedded textures
2019-11-01 12:29:54 +00:00
8ebd48442e
Made the M3D SDK C++ wrapper optional
2019-11-01 03:39:36 +01:00
aa4c9fb5fa
Merge pull request #2731 from RevoluPowered/feature/easy-armature-lookup
...
Implemented armature lookup and updated FBX importer to properly support this
2019-10-30 20:23:59 +01:00
3bf81375da
Fixed clang's problem with register keyword
2019-10-30 03:06:24 +01:00
37cc29c020
Fixed clang's problem with register keyword
2019-10-30 03:04:33 +01:00
0ff3e40157
Fixed clang's casting issue and MSVC's buffer allocation problem
2019-10-30 02:35:51 +01:00
Dylan Kenneally
Kim Kulling
Kim Kulling
Justin Carpentier
thewoz
Justin Carpentier
Mike Samsonov
Zoltan Baldaszti
bzt
tanolino