Commit: dc27d31a2100c3272d0dbf293b24131eacaab962
Author: Sybren A. Stüvel
Date: Wed Apr 26 16:50:29 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBdc27d31a2100c3272d0dbf293b24131eacaab962
Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8
# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc
===================================================================
===================================================================
diff --cc source/blender/alembic/intern/abc_exporter.cc
index dd65613e223,11c63461ab4..2c2d0b598e9
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@@ -553,11 -551,9 +554,11 @@@ void AbcExporter::createParticleSystems
}
}
-void AbcExporter::createShapeWriter(Object *ob, Object *dupliObParent)
+void AbcExporter::createShapeWriter(Base *ob_base, Object *dupliObParent)
{
+ Object *ob = ob_base->object;
+
- if (!object_is_shape(ob)) {
+ if (!object_type_is_exportable(ob)) {
return;
}
diff --cc tests/python/bl_alembic_import_test.py
index e83d38aec63,ef5ae372333..854a5846361
--- a/tests/python/bl_alembic_import_test.py
+++ b/tests/python/bl_alembic_import_test.py
@@@ -83,9 -83,9 +83,9 @@@ class SimpleImportTest(unittest.TestCas
# All cubes should be selected, but the sphere shouldn't be.
for ob in bpy.data.objects:
- self.assertEqual('Cube' in ob.name, ob.select)
+ self.assertEqual('Cube' in ob.name, ob.select_get())
- def test_change_path(self):
+ def test_change_path_constraint(self):
import math
fname = 'cube-rotating1.abc'
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
