99c6601a1f
Merge branch 'master' into blender2.8
2017-05-23 17:35:45 +02:00
7b25ffb618
Fix T51534: Alembic: added support for face-varying vertex colours
...
Houdini writes vertex data in a different format than Blender does; Houdini
uses "face-varying scope", which means that the vertex colours are indexed
by an ever-increasing number over all vertices of all faces instead of the
vertex index.
I've also merged the read_custom_data_mcols() and read_mcols() functions,
because the latter was only called from the former, and the changes in this
commit would add yet more function parameters to pass.
2017-05-23 17:27:15 +02:00
dc27d31a21
Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8
...
# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc
2017-04-26 16:50:29 +02:00
dba6e170c4
Alembic import: added unit test for mesh deformation.
2017-04-26 10:42:20 +02:00
6822e353ff
Merge branch 'master' into blender2.8
2017-04-25 17:04:17 +02:00
3128600a8a
Fix T51262: Blender CRASH with alembic file
...
Also added a unit test for exporting & importing very long names.
2017-04-25 12:06:03 +02:00
Dalai Felinto
e6f073fe41
Re-enabling Alembic test
...
(disabled because of bug fixed on 19548040d9
2017-04-21 16:07:53 +02:00
81011679dd
Merge branch 'master' into blender2.8
2017-04-21 14:19:05 +02:00
9c02990ac1
Alembic import: changing cache modifier path no longer discards object paths
...
This allows, for example, the path of an Alembic file to be changed from
absolute to relative, without having to reconstruct all object paths.
2017-04-21 14:11:49 +02:00
aa4102a441
Merge branch 'master' into blender2.8
...
Disabled a unittest, to be re-enabled when T51261 is fixed.
# Conflicts:
# source/blender/alembic/intern/alembic_capi.cc
2017-04-20 12:50:20 +02:00
ae79eb2105
Alembic import: select imported objects
...
When the Alembic import is finished, all imported objects are selected.
2017-04-20 12:01:31 +02:00
c0f9d962f0
Merge branch 'master' into blender2.8
...
Updated tests/python/bl_alembic_import_test.py to be 2.8-compatible.
2017-04-19 17:33:22 +02:00
aaec934096
Alembic import: added simple unit test for importer.
...
It only tests the presence of the objects and their parent/child pointers.
Matrix and animated properties should be done in a later test.
2017-04-19 17:28:25 +02:00
