Kim Kulling
|
d594e6eea4
|
Merge branch 'master' into obj-pbr-explicit
|
2022-03-15 14:30:24 +01:00 |
|
Kim Kulling
|
bcee205542
|
Merge pull request #4437 from jaefunk/issue_4349
add ifndef guard for resolve to fails to compile
|
2022-03-15 14:28:43 +01:00 |
|
Kim Kulling
|
0904490150
|
Merge branch 'master' into issue_4349
|
2022-03-15 14:11:57 +01:00 |
|
Kim Kulling
|
7919461951
|
Merge pull request #4441 from assimp/kimkulling/fix_doxygen_version
Update version in doxy-config
|
2022-03-15 14:11:38 +01:00 |
|
Kim Kulling
|
e4fb0e0960
|
Merge branch 'master' into kimkulling/fix_doxygen_version
|
2022-03-15 13:33:54 +01:00 |
|
Kim Kulling
|
d87111983a
|
Merge pull request #4431 from TerenceRussell/master
Added missing ObjMaterial.h to CMakeLists
|
2022-03-15 13:33:13 +01:00 |
|
Kim Kulling
|
b1dc8cfe56
|
Merge branch 'master' into master
|
2022-03-15 11:58:45 +01:00 |
|
Kim Kulling
|
7296ffc3f5
|
Merge pull request #4426 from sacereda/info-material-properties
Add properties information on assimp info command line
|
2022-03-15 11:57:58 +01:00 |
|
Kim Kulling
|
b567497a17
|
Merge branch 'master' into info-material-properties
|
2022-03-15 10:57:14 +01:00 |
|
Kim Kulling
|
e1dae1402e
|
Merge pull request #4425 from sacereda/metallic-roughness-split
glTF2: Metallic roughness split
|
2022-03-15 10:56:43 +01:00 |
|
Kim Kulling
|
68f3386c7b
|
Merge branch 'master' into metallic-roughness-split
|
2022-03-15 08:38:38 +01:00 |
|
Kim Kulling
|
9e0357a8b6
|
Merge pull request #4423 from youkeyao/parse_obj_anisotropy
Fix getting anisotropy in obj
|
2022-03-15 08:38:13 +01:00 |
|
Kim Kulling
|
72888c49f6
|
Merge branch 'master' into parse_obj_anisotropy
|
2022-03-15 08:13:35 +01:00 |
jaefunk
|
4457d9300a
|
Merge branch 'master' into issue_4349
|
2022-03-14 15:41:20 +09:00 |
|
Kim Kulling
|
0ef830d2b1
|
Update version in doxy-config
|
2022-03-12 16:57:27 +01:00 |
Sergio Acereda
|
729ab8ae33
|
Trying to fix reorder error
|
2022-03-12 08:15:11 +01:00 |
|
Sergio Acereda
|
26bb601d8f
|
Fix includes
|
2022-03-12 08:03:27 +01:00 |
|
Sergio Acereda
|
51e248909f
|
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
|
2022-03-11 22:29:59 +01:00 |
|
jaefunk
|
e02d51ec24
|
add ifndef guard for resolve to fails to compile
|
2022-03-11 10:51:13 +09:00 |
|
Kim Kulling
|
a305d14b8f
|
Merge pull request #4421 from RichardTea/update_ai_texture_type_max
Update AI_TEXTURE_TYPE_MAX
|
2022-03-10 13:54:55 +01:00 |
|
Kim Kulling
|
5e69517742
|
Merge branch 'master' into update_ai_texture_type_max
|
2022-03-10 11:37:46 +01:00 |
|
Kim Kulling
|
1b3ae63527
|
Merge pull request #4434 from karjonas/always_true
Fix 'i >= 0' always true bug
|
2022-03-10 11:37:03 +01:00 |
|
Kim Kulling
|
47f004517f
|
Add missing cast.
|
2022-03-10 10:33:29 +01:00 |
Jonas Karlsson
|
c14eccefaf
|
Fix 'i >= 0' always true bug
If 'disk_filename' does not contain a dot (.) then 'i' would overflow.
Making 'i' an int makes sure the for loop works as intended.
|
2022-03-09 23:05:47 +01:00 |
Terence Russell
|
efe92e9ec1
|
Merge branch 'assimp:master' into master
|
2022-03-09 10:15:41 -07:00 |
|
Kim Kulling
|
1bf5dd2731
|
Merge pull request #4432 from assimp/kimkulling/init_fbx_texture_members_issue4429
Fix missing members and do some small refactorings.
|
2022-03-09 11:35:01 +01:00 |
kimkulling
|
26598dc6bd
|
Forget to save file.
|
2022-03-09 11:00:05 +01:00 |
|
kimkulling
|
76e10b96fc
|
Fix missing members and do some small refactorings.
|
2022-03-09 10:51:37 +01:00 |
|
Terence Russell
|
b35879989c
|
Added missing ObjMaterial.h to CMakeLists
|
2022-03-08 20:00:22 -07:00 |
|
Kim Kulling
|
40d896ccc1
|
Merge pull request #4403 from JaroslavPribyl/fix/obj_with_bspline_crash
Fix parsing OBJ with free-form curve/surface body statements
|
2022-03-07 21:39:38 +01:00 |
|
Kim Kulling
|
ba379c20e1
|
Merge branch 'master' into fix/obj_with_bspline_crash
|
2022-03-06 17:39:57 +01:00 |
|
Kim Kulling
|
92b5c284ce
|
Merge pull request #4203 from RichardTea/deprecated_gltfpbr_macros
Reinstate a deprecated gltfpbr macro: AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS
|
2022-03-06 17:39:35 +01:00 |
|
Kim Kulling
|
9ca9254445
|
Merge branch 'master' into deprecated_gltfpbr_macros
|
2022-03-06 11:15:49 +01:00 |
|
Kim Kulling
|
7eb5fd0e4e
|
Merge pull request #4427 from assimp/smartday-master
Smartday master
|
2022-03-05 23:00:21 +01:00 |
|
Kim Kulling
|
80a8807c47
|
Fix compiler warnings
|
2022-03-05 20:37:34 +01:00 |
|
Kim Kulling
|
d4527d4e87
|
Merge branch 'master' into master
|
2022-03-05 14:00:32 +01:00 |
|
Sergio Acereda
|
a2543e7151
|
Add properties information on assimp info command line
|
2022-03-04 17:09:29 +01:00 |
|
Sergio Acereda
|
a1e03e3481
|
clang-format
|
2022-03-04 14:31:06 +01:00 |
|
Sergio Acereda
|
cfe84b9260
|
Use generic METALNESS and DIFFUSE_ROUGHNESS texture types
|
2022-03-03 16:18:25 +01:00 |
|
Sergio Acereda
|
52008ec989
|
Apply clang-format
|
2022-03-03 15:42:23 +01:00 |
youkeyao
|
9b227fc262
|
Fix getting anisotropy in obj
|
2022-03-03 01:01:34 +08:00 |
RichardTea
|
8a6a1fc2df
|
Update AI_TEXTURE_TYPE_MAX
Must be equal to the largest aiTextureType_XXX enum
|
2022-03-01 12:12:07 +00:00 |
|
RichardTea
|
d704824be3
|
Merge branch 'master' into deprecated_gltfpbr_macros
|
2022-03-01 10:01:43 +00:00 |
|
Kim Kulling
|
bbcefbd034
|
Merge pull request #4417 from rbsheth/rbsheth_fix_hunter
Update version of Hunter to v0.24.0 that supports VS 2022
|
2022-02-28 23:48:19 +01:00 |
Jaroslav Pribyl
|
62930076af
|
Merge branch 'master' into fix/obj_with_bspline_crash
|
2022-02-26 04:03:59 +01:00 |
Rahul Sheth
|
e368a69824
|
Merge branch 'master' into rbsheth_fix_hunter
|
2022-02-25 14:58:07 -06:00 |
|
Kim Kulling
|
3957fbba8b
|
Merge pull request #4416 from SolaToucher/master
Optimize the problem of excessive memory allocation in FBX import
|
2022-02-25 21:03:47 +01:00 |
|
Rahul Sheth
|
8e59287b94
|
Update version of Hunter to v0.24.0 that supports VS 2022
|
2022-02-25 13:52:18 -06:00 |
sola
|
c73ff82fc4
|
FBXConvert::ConvertMeshMultiMaterial: allocate memory using variable count_vertices
|
2022-02-25 19:58:44 +08:00 |
|
Kim Kulling
|
04858c5d89
|
Merge pull request #4409 from TerenceRussell/master
Expose the original OBJ "illum" value
|
2022-02-25 00:06:12 +01:00 |