Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Wed, 26 Apr 2017 14:50:29 +0000 (16:50 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Wed, 26 Apr 2017 14:50:29 +0000 (16:50 +0200)
# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc

1  2 
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_object.cc
source/blender/alembic/intern/alembic_capi.cc
tests/python/bl_alembic_import_test.py

index dd65613e2232ff985f0aac07c96c3935d70a1a73,11c63461ab40dfe671ea61082c2b8e70f5c48118..2c2d0b598e92b8683d0ca3540bbdb7d4b2d9952b
@@@ -553,11 -551,9 +554,11 @@@ void AbcExporter::createParticleSystems
        }
  }
  
 -void AbcExporter::createShapeWriter(Object *ob, Object *dupliObParent)
 +void AbcExporter::createShapeWriter(Base *ob_base, Object *dupliObParent)
  {
-       if (!object_is_shape(ob)) {
 +      Object *ob = ob_base->object;
 +
+       if (!object_type_is_exportable(ob)) {
                return;
        }
  
index e83d38aec63cdb9c6e07ae30760b2be976c4b0f6,ef5ae37233372fd4db183c92cee9a8d52212047f..854a5846361d3fbd088d9ee9341188216a230e3d
@@@ -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'