Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8
[blender.git] / source / blender / alembic / intern / abc_exporter.cc
index dd65613e2232ff985f0aac07c96c3935d70a1a73..2c2d0b598e92b8683d0ca3540bbdb7d4b2d9952b 100644 (file)
@@ -108,7 +108,7 @@ static bool object_is_smoke_sim(Object *ob)
        return false;
 }
 
-static bool object_is_shape(Object *ob)
+static bool object_type_is_exportable(Object *ob)
 {
        switch (ob->type) {
                case OB_MESH:
@@ -117,6 +117,7 @@ static bool object_is_shape(Object *ob)
                        }
 
                        return true;
+               case OB_EMPTY:
                case OB_CURVE:
                case OB_SURF:
                case OB_CAMERA:
@@ -387,7 +388,7 @@ void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Base *ob_base, O
                return;
        }
 
-       if (object_is_shape(ob)) {
+       if (object_type_is_exportable(ob)) {
                createTransformWriter(ob, parent, dupliObParent);
        }
 
@@ -557,7 +558,7 @@ 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;
        }