Kim Kulling
|
89a865ce19
|
Merge branch 'master' into master
|
2020-05-06 22:07:39 +02:00 |
|
Kim Kulling
|
8d41af09bc
|
Merge pull request #3209 from sercand/fix-macos-framework
fix incorrect header path on framework build
|
2020-05-06 15:50:52 +02:00 |
Sercan Degirmenci
|
201347700f
|
fix incorrect header path on framework build
|
2020-05-06 16:15:23 +03:00 |
|
Kim Kulling
|
d8bb6e446a
|
Merge pull request #3208 from assimp/issue_3186
Remove duplicate flag
|
2020-05-06 13:56:10 +02:00 |
|
Kim Kulling
|
4c75857f50
|
Remove duplicate flag
|
2020-05-06 13:46:26 +02:00 |
|
Kim Kulling
|
519b5871e3
|
Merge pull request #3207 from thomasbiang/gltf2_blendshapeImportMissing
Fix for issue# 3206: GLTF2 blendshape import missing shapes https://github.com/assimp/assimp/issues/3206
|
2020-05-06 13:34:30 +02:00 |
Yingying Wang
|
60e8146b9f
|
fix wrong target idx when importing
|
2020-05-05 12:51:40 -07:00 |
|
Kim Kulling
|
cacc7c1b27
|
Merge pull request #3204 from assimp/aaronfranke-file-formatting
Aaronfranke file formatting
|
2020-05-05 17:09:55 +02:00 |
RichardTea
|
dc8550290e
|
Ensure to delete the scene copy after the test
|
2020-05-05 10:53:26 +01:00 |
|
RichardTea
|
56a4e61533
|
Collada: Don't copy the scene when exporting
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
|
2020-05-05 10:16:13 +01:00 |
|
RichardTea
|
6e447b2c44
|
Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes
|
2020-05-05 09:52:08 +01:00 |
|
RichardTea
|
d1ae6ac77a
|
Fix typo in <visual_scene>
Swapped Id and Name
|
2020-05-05 09:51:41 +01:00 |
|
RichardTea
|
700bddb81a
|
Merge branch 'master' into collada_unit_test_cleanup
|
2020-05-05 09:34:09 +01:00 |
|
RichardTea
|
fa1d2f09db
|
Merge branch 'master' into bug-3177-dae-geo-id
|
2020-05-05 09:33:48 +01:00 |
|
RichardTea
|
e1decbd532
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-05 09:30:44 +01:00 |
|
Kim Kulling
|
ddee1b1ddb
|
Merge branch 'master' into aaronfranke-file-formatting
|
2020-05-05 10:21:46 +02:00 |
kkulling
|
4e16716924
|
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
|
2020-05-05 10:17:52 +02:00 |
David M. Golembiowski
|
124e95c477
|
Merge branch 'master' into master
|
2020-05-05 01:03:03 -04:00 |
|
Kim Kulling
|
3a84675c2b
|
Merge pull request #3202 from assimp/issue_3190
closes https://github.com/assimp/assimp/issues/3190 : fix leak.
|
2020-05-04 22:16:25 +02:00 |
|
Kim Kulling
|
bf95d1da7c
|
fix conversion
|
2020-05-04 21:48:46 +02:00 |
|
Kim Kulling
|
6afb72216c
|
Compile constructor of aiMetadataType only for c++
|
2020-05-04 20:50:44 +02:00 |
Kim Kulling
|
3b4a9812e5
|
add init list for metadatatype.
|
2020-05-04 20:40:08 +02:00 |
|
RichardTea
|
8e73984a11
|
Collada Root Nodes aren't allowed to have meshes
Create a null parent node instead
|
2020-05-04 17:47:09 +01:00 |
|
kimkulling
|
5c9a08e375
|
closes https://github.com/assimp/assimp/issues/3190 : fix leak.
|
2020-05-04 15:36:54 +02:00 |
|
RichardTea
|
6e200cb0d3
|
Merge branch 'master' into bug-3177-dae-geo-id
Impossible merge, have discarded upstream
|
2020-05-04 13:59:09 +01:00 |
|
RichardTea
|
ea917bd4ae
|
Move Collada into AssetLib folder
Should make the merge easier
|
2020-05-04 13:54:49 +01:00 |
|
RichardTea
|
5a986090ca
|
Merge branch 'master' into collada_unit_test_cleanup
|
2020-05-04 13:25:38 +01:00 |
|
RichardTea
|
c6213836aa
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-04 13:21:52 +01:00 |
|
Kim Kulling
|
c4ea522b6d
|
Merge branch 'master' into master
|
2020-05-04 10:18:03 +02:00 |
|
Kim Kulling
|
8675bb0912
|
Merge pull request #3197 from assimp/kimkulling_dev
Kimkulling dev
|
2020-05-03 18:58:49 +02:00 |
|
Kim Kulling
|
918d3d4206
|
fix invalid endif statement in cmake.
|
2020-05-03 15:55:42 +02:00 |
|
Kim Kulling
|
91fa9a102b
|
closes https://github.com/assimp/assimp/issues/3181: fix typo for light type.
|
2020-05-03 12:17:32 +02:00 |
|
Kim Kulling
|
09dcb76063
|
Merge branch 'master' into kimkulling_dev
|
2020-05-03 11:50:18 +02:00 |
|
Kim Kulling
|
3b06f57150
|
add missing inclde +
|
2020-05-02 21:11:47 +02:00 |
|
Kim Kulling
|
4f902faddf
|
build: move option for viewer to the other options.
|
2020-05-02 21:08:24 +02:00 |
|
Kim Kulling
|
514593548d
|
add assert-test for nullptr.
|
2020-05-02 21:07:41 +02:00 |
|
Kim Kulling
|
3329e76263
|
closes https://github.com/assimp/assimp/issues/3178: throw exception in case of invalid export stream.
|
2020-05-02 21:06:55 +02:00 |
|
Kim Kulling
|
a874facbbf
|
Merge pull request #3196 from assimp/kimkulling_dev
Kimkulling dev
|
2020-05-02 19:55:33 +02:00 |
|
Kim Kulling
|
f8e6512a63
|
Move format importer and exporter into its won folder.
|
2020-05-02 15:14:38 +02:00 |
|
David M. Golembiowski
|
314bdf196b
|
Merge branch 'master' into master
|
2020-05-01 18:34:29 -04:00 |
|
David M. Golembiowski
|
8c243b80c0
|
Merge pull request #3 from dmgolembiowski/rust-port
Rust port
|
2020-05-01 18:24:33 -04:00 |
|
David Golembiowski
|
57e837092e
|
populated module level files
|
2020-05-01 18:23:14 -04:00 |
|
David Golembiowski
|
778c3afbbb
|
Rust's import system dictates that we must make directories rather than use individual files to provide a clean public interface
|
2020-05-01 18:11:44 -04:00 |
|
David Golembiowski
|
2d43a24475
|
memory info struct
|
2020-05-01 17:41:16 -04:00 |
|
David Golembiowski
|
a286506c23
|
fixed a couple of things. Adding MaterialPropertyString
|
2020-05-01 17:32:55 -04:00 |
|
David Golembiowski
|
e6837f7394
|
Need to consider different implementations of String kinds in Rust, and additionally how we may want to `impl Copy for Str`, i.e. `std::mem::swap` with placeholders to keep performance up.
|
2020-05-01 17:25:02 -04:00 |
|
David Golembiowski
|
38b80f6c6b
|
populating plane struct
|
2020-05-01 16:58:32 -04:00 |
|
David Golembiowski
|
ba633f95bb
|
populating colors
|
2020-05-01 16:54:56 -04:00 |
|
David Golembiowski
|
4f8eb0f79c
|
populating Texel struct definition for textures
|
2020-05-01 16:50:31 -04:00 |
|
David Golembiowski
|
c338c5ca02
|
Populating 3d and 4d matrix struct definitions
|
2020-05-01 16:47:35 -04:00 |