Kim Kulling
|
331cb5ac72
|
Update M3DImporter.cpp
|
2022-01-18 22:23:01 +01:00 |
|
Kim Kulling
|
c3b91dd766
|
C4D. Fix merge conflicts
|
2022-01-18 22:21:58 +01:00 |
|
Kim Kulling
|
ea5996307a
|
Update B3DImporter.cpp
|
2022-01-18 22:20:37 +01:00 |
|
Kim Kulling
|
efd1d36aa9
|
Merge branch 'master' into krishty-new-file-detection
|
2022-01-18 22:17:50 +01:00 |
|
Kim Kulling
|
959af1ac4d
|
Revert change
|
2022-01-18 21:37:49 +01:00 |
|
Kim Kulling
|
7350baea93
|
Revert change
|
2022-01-18 21:36:55 +01:00 |
|
Kim Kulling
|
cf47411742
|
Revert change
|
2022-01-18 21:36:02 +01:00 |
|
Kim Kulling
|
1e80630d5d
|
Revert change.
|
2022-01-18 21:35:09 +01:00 |
|
Kim Kulling
|
037732c429
|
Revert change
|
2022-01-18 21:34:18 +01:00 |
|
Kim Kulling
|
cff213d4dd
|
Revert change
|
2022-01-18 21:33:05 +01:00 |
|
Kim Kulling
|
9d0006fecb
|
Revert change
|
2022-01-18 21:32:06 +01:00 |
Kim Kulling
|
5af79cac1d
|
Fix unittests + small refactorings
|
2022-01-18 21:23:43 +01:00 |
|
Kim Kulling
|
141c6ca270
|
Merge pull request #4339 from Esri/jere9309/read_collada_materials
Collada: Read all instance_material child nodes
|
2022-01-18 20:28:39 +01:00 |
Jeremy Sigrist
|
59f28e168e
|
Merge branch 'master' into jere9309/read_collada_materials
|
2022-01-18 09:55:33 -08:00 |
|
Kim Kulling
|
3cca102531
|
Merge pull request #4265 from Garux/IQM
add Inter-Quake Model (IQM) Importer
|
2022-01-17 21:43:33 +01:00 |
|
Kim Kulling
|
6e50b04ae0
|
Merge branch 'master' into IQM
|
2022-01-17 18:33:37 +01:00 |
|
Kim Kulling
|
f21ff66505
|
Merge pull request #4323 from tanolino/patch-1
Locale independent meter scale
|
2022-01-17 18:32:24 +01:00 |
|
Kim Kulling
|
f16e4fadc7
|
Merge branch 'master' into patch-1
|
2022-01-17 18:18:16 +01:00 |
|
Kim Kulling
|
cbde086bfb
|
Merge branch 'krishty-new-file-detection' of https://github.com/assimp/assimp into krishty-new-file-detection
|
2022-01-16 20:58:07 +01:00 |
|
Kim Kulling
|
acd70b35a0
|
Fix merge issues
|
2022-01-16 20:57:56 +01:00 |
|
Kim Kulling
|
6ad7505376
|
Merge branch 'master' into krishty-new-file-detection
|
2022-01-16 20:43:57 +01:00 |
|
Kim Kulling
|
05746acb07
|
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection
|
2022-01-16 20:41:24 +01:00 |
|
Kim Kulling
|
41cfcc7d16
|
Merge pull request #4336 from kovacsv/common_base64
Move Base64 encode/decode functionality to the common folder
|
2022-01-16 14:44:54 +01:00 |
|
Kim Kulling
|
f8253c3e3c
|
Update Base64.hpp
|
2022-01-16 13:21:01 +01:00 |
|
Kim Kulling
|
7eec3f0d8f
|
Update copyrights.
|
2022-01-16 13:19:25 +01:00 |
Viktor Kovacs
|
c8ab39dd04
|
Merge branch 'master' into common_base64
|
2022-01-15 23:42:56 +01:00 |
|
Kim Kulling
|
5976d54437
|
Merge pull request #4204 from TThulesen/so-unloading
Allow dlclose of so library by avoiding unique symbols.
|
2022-01-13 20:32:02 +01:00 |
|
Kim Kulling
|
d3e24196c0
|
Merge branch 'master' into so-unloading
|
2022-01-13 20:19:23 +01:00 |
|
Jeremy Sigrist
|
5aac72791d
|
Merge branch 'master' into jere9309/read_collada_materials
|
2022-01-12 10:12:58 -08:00 |
Jeremy Sigrist
|
e671d087e1
|
Collada: Read all instance_material child nodes
|
2022-01-12 09:52:12 -08:00 |
|
Viktor Kovacs
|
c71f4bc95a
|
Merge branch 'master' into common_base64
|
2022-01-11 18:46:08 +01:00 |
|
Kim Kulling
|
6a640a2de8
|
Merge pull request #4330 from danoli3/master
Assimp Patch Android LTS NDK 23 Fix
|
2022-01-11 10:30:40 +01:00 |
|
Kim Kulling
|
9d06bd4678
|
Merge branch 'master' into master
|
2022-01-11 10:13:22 +01:00 |
|
Kim Kulling
|
5dcaf445c3
|
Merge pull request #4337 from lopsided98/patch-1
Fix imported target include directory
|
2022-01-11 10:13:02 +01:00 |
tanolino
|
f8abb015de
|
Merge branch 'master' into patch-1
|
2022-01-11 09:55:19 +01:00 |
Dan Rosser
|
e6cc187a7e
|
Merge branch 'master' into master
|
2022-01-11 13:51:59 +11:00 |
|
Kim Kulling
|
d68224f2ed
|
Merge branch 'master' into patch-1
|
2022-01-10 23:45:03 +01:00 |
|
Kim Kulling
|
a2c2b64877
|
Merge pull request #4335 from assimp/update_copyrights
Update copyrights
|
2022-01-10 21:53:59 +01:00 |
|
Kim Kulling
|
f63b10bf45
|
OpenGEX: Fix usage of texture specular token
|
2022-01-10 21:22:44 +01:00 |
|
Viktor Kovacs
|
6b9732721a
|
Merge branch 'assimp:master' into common_base64
|
2022-01-10 21:15:31 +01:00 |
|
Kim Kulling
|
50c7301a38
|
Update copyrights
|
2022-01-10 21:13:43 +01:00 |
|
Dan Rosser
|
00bf74ad6d
|
Merge branch 'master' into master
|
2022-01-10 14:04:24 +11:00 |
Ben Wolsieffer
|
629c8850ec
|
Fix imported target include directory
Fix the imported target include directory when the headers are not installed in '${CMAKE_INSTALL_PREFIX}/include'.
|
2022-01-09 20:59:14 -05:00 |
|
Kim Kulling
|
8134cae998
|
Merge pull request #4333 from assimp/kimkulling-prepare_v5.1.6
Update to 5.1.6
|
2022-01-09 23:45:44 +01:00 |
|
Kim Kulling
|
30f1583dde
|
Update utVersion.cpp
|
2022-01-09 21:06:05 +01:00 |
|
Kim Kulling
|
1d8667bfdc
|
Update to 5.1.6
|
2022-01-09 18:06:33 +01:00 |
|
Dan Rosser
|
9c4255b486
|
Assimp Android LTS NDK 23 Fix
|
2022-01-09 18:19:33 +11:00 |
|
Kim Kulling
|
cb3e846a19
|
Merge pull request #4318 from vpzomtrrfrt/fix-bone-fit-check
Fix bone fitted check in gltf2 exporter
|
2022-01-08 12:59:21 +01:00 |
|
Kim Kulling
|
8cb5ab69b0
|
Merge branch 'master' into fix-bone-fit-check
|
2022-01-08 11:35:59 +01:00 |
|
Kim Kulling
|
b40d9abdb9
|
Merge pull request #4328 from assimp/kimkulling-x3d_fix_nullptr_exception
Fix nullptr-dereferencing
|
2022-01-08 11:35:45 +01:00 |