iamAdrianIusca
d527939881
fixed the windows build
2020-04-24 00:16:38 +03:00
iamAdrianIusca
5b7e9ccb5f
small fix
2020-04-23 23:48:35 +03:00
Adrian Iusca
40b611b478
Merge branch 'master' into master
2020-04-23 22:42:16 +03:00
iamAdrianIusca
f1817598b0
fix the whitespaces
2020-04-23 22:42:03 +03:00
iamAdrianIusca
d777070eb1
fix the whitespaces
2020-04-23 22:41:22 +03:00
iamAdrianIusca
d02be05862
fix the whitespaces
2020-04-23 22:40:14 +03:00
iamAdrianIusca
a77a18693d
fix the whitespaces
2020-04-23 22:37:41 +03:00
iamAdrianIusca
1450b5b29c
fix the whitespaces
2020-04-23 22:35:55 +03:00
iamAdrianIusca
f8024188f0
fix the whitespaces
2020-04-23 22:33:13 +03:00
iamAdrianIusca
798f6cf083
fix the whitespaces
2020-04-23 22:30:58 +03:00
iamAdrianIusca
efa6ead1a5
fix the whitespaces
2020-04-23 22:27:55 +03:00
iamAdrianIusca
74931fe6d9
fix the whitespaces
2020-04-23 22:25:38 +03:00
iamAdrianIusca
bcd86ccc76
fix
2020-04-23 22:23:55 +03:00
Kim Kulling
7f9a1887f3
Merge pull request #3164 from assimp/migenius-migenius-rsws53-mig-2
...
Migenius migenius rsws53 mig 2
2020-04-23 21:20:45 +02:00
iamAdrianIusca
e5f69d55bb
fix
2020-04-23 22:20:28 +03:00
iamAdrianIusca
871f3fd337
fix
2020-04-23 22:18:59 +03:00
iamAdrianIusca
287030e720
fix
2020-04-23 22:17:48 +03:00
Kim Kulling
9b1759dcc2
Merge branch 'master' into migenius-migenius-rsws53-mig-2
2020-04-22 19:59:53 +02:00
Kim Kulling
ca70b44e44
Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2
2020-04-22 19:58:41 +02:00
Kim Kulling
e3256303f5
Merge pull request #3085 from napina/optimized_bonelimits
...
Optimized LimitBoneWeightsProcess.
2020-04-21 19:52:36 +02:00
Adrian Iusca
5ec896af49
Merge branch 'master' into master
2020-04-21 20:33:29 +03:00
Kim Kulling
2471ae9fcc
Merge branch 'master' into optimized_bonelimits
2020-04-21 19:31:54 +02:00
Kim Kulling
92cb3402ab
Merge pull request #3161 from assimp/kimkulling-installerupdate
...
Update to 5.0.1
2020-04-21 19:31:05 +02:00
Kim Kulling
c36b028412
fix type error for template deduction.
2020-04-21 16:39:18 +02:00
Kim Kulling
232761be02
Fix another typo
2020-04-21 16:09:11 +02:00
Kim Kulling
32de8737b7
Update to 5.0.1
2020-04-21 16:07:58 +02:00
Kim Kulling
435f898ffa
Update to 5.0.1
2020-04-21 16:06:52 +02:00
Kim Kulling
843ca6e386
Fix typo
2020-04-21 15:50:17 +02:00
Kim Kulling
428b91154a
Adapt smallvector
...
- Add doc ( public header )
- Fix type error
2020-04-21 08:59:40 +02:00
Kim Kulling
788f2f244e
Adapt code
...
- Reformatting based on clang-format rules
- Add usage of size_t instead of unsigned int for sizes
- Fix typo in naming
2020-04-21 08:50:51 +02:00
Kim Kulling
c91d3764ca
Merge branch 'master' into optimized_bonelimits
2020-04-21 08:45:50 +02:00
Kim Kulling
69bdebf3ac
Merge pull request #3149 from timuber/master
...
Add support for glTF2 targetNames
2020-04-20 14:52:53 +02:00
Kim Kulling
f71b332ed1
Update glTF2Asset.inl
...
fix VS-compiler warning.
2020-04-19 21:14:47 +02:00
Kim Kulling
e3563212d7
Merge branch 'master' into master
2020-04-19 21:13:12 +02:00
Kim Kulling
e0f6eb09e6
Merge branch 'master' into optimized_bonelimits
2020-04-17 20:37:28 +02:00
Kim Kulling
8219b7c362
Merge pull request #3155 from Zalewa/libsuffix-import-prefix
...
Erase the remaining _INSTALL_PREFIX and LIBSUFFIX in CMake files
2020-04-17 20:36:59 +02:00
Kim Kulling
1567652e60
Merge branch 'master' into libsuffix-import-prefix
2020-04-17 19:22:50 +02:00
Kim Kulling
6daecdcc5a
Merge pull request #3158 from Hehongyuanlove/master
...
3MF fix
2020-04-17 19:19:21 +02:00
Kim Kulling
c67f97e956
Merge branch 'master' into master
2020-04-17 16:37:09 +02:00
Kim Kulling
e299f71cfe
Adapt the formatting
2020-04-17 16:16:28 +02:00
Kim Kulling
f4b7a98131
Merge pull request #3131 from malortie/sample-simpletextureddirectx11-nullptr
...
Replaced NULL with nullptr for pointers in sample SimpleTexturedDirectx11.
2020-04-17 14:54:08 +02:00
Kim Kulling
966b5f4330
Merge branch 'master' into sample-simpletextureddirectx11-nullptr
2020-04-17 14:43:20 +02:00
Hehongyuanlove
9c52fd7633
Update D3MFExporter.cpp
2020-04-17 12:58:41 +08:00
Hehongyuanlove
f80bdc5b71
Update StringUtils.h
2020-04-17 12:57:33 +08:00
Hehongyuanlove
59e32a5ad9
Update StringUtils.h
2020-04-17 12:51:18 +08:00
Hehongyuanlove
cc3760aff1
Update StringUtils.h
2020-04-17 12:50:49 +08:00
Hehongyuanlove
e9a72a5053
repair formate 3MF
2020-04-17 12:38:07 +08:00
Hehongyuanlove
3bbc8e76bd
Rgba2Hex to repair rgba(1,1,1,1)
2020-04-17 12:34:05 +08:00
Hehongyuanlove
3154cec79c
Rgba2Hex add
2020-04-17 12:31:07 +08:00
Robikz
379d59bcbd
Erase the remaining _INSTALL_PREFIX and LIBSUFFIX in CMake files
...
These seem to have survived from the migration to GNUInstallDirs in
9fb81c3be6
_INSTALL_PREFIX was not set anywhere and resolved to empty value, which
in turn caused some paths in the installed lib config CMake files to
start from '/', effectively causing the failure of the "do the installed
files exist" checks.
After complete replacement of all uses of the _INSTALL_PREFIX with
GNUInstallDirs equivalents, the LIBSUFFIX variable has become unused
and can be removed too.
2020-04-16 16:02:34 +02:00