[Bf-blender-cvs] [fc978f3c19] temp-sybren-alembic: Revert "Alembic import: don't crash on instances"

[Sybren A. Stüvel]

Commit: fc978f3c1918b47d555dc74b8a145f83465a21db
Author: Sybren A. Stüvel
Date:   Tue Feb 28 10:09:41 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rBfc978f3c1918b47d555dc74b8a145f83465a21db

Revert "Alembic import: don't crash on instances"

This reverts commit 9bf69ab3c1ac77ce3cb4fd6090b6e8ff722de64d. The commit
prevents instances from loading at all, which is fine in the light of
upcoming commits (where they are handled as true instances), but for now
we'd better load instances as real objects; this is the old behaviour, and
is probably preferred over not loading those instances at all.

===================================================================

M	source/blender/alembic/intern/alembic_capi.cc

===================================================================

diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index d2ecfbf81f..b139b42bbc 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -376,7 +376,7 @@ void ABC_export(
 
 /* ********************** Import file ********************** */
 
-static int visit_object(IObject object,
+static int visit_object(const IObject &object,
                          std::vector<AbcObjectReader *> &readers,
                          GHash *readers_map,
                          ImportSettings &settings)
@@ -515,17 +515,6 @@ static int visit_object(IObject object,
 
 //	std::cerr << std::endl;
 
-	if (object.isInstanceRoot()) {
-		std::cerr << "Alembic object " << full_name
-		          << " is an instance of other object "
-		          << object.instanceSourcePath()
-		          << ", ignoring for now." << std::endl;
-		if (reader) {
-			delete reader;
-			reader = NULL;
-		}
-	}
-
 	if (reader) {
 		readers.push_back(reader);
 		reader->incref();