[Bf-blender-cvs] [c2ba2bb469] temp-sybren-alembic: FIXUP less sloppy with bool vs. int

[Sybren A. Stüvel]

Commit: c2ba2bb4692570816342c5a64af290c748b613f4
Author: Sybren A. Stüvel
Date:   Thu Mar 2 10:13:42 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rBc2ba2bb4692570816342c5a64af290c748b613f4

FIXUP less sloppy with bool vs. int

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

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 71814ab781..00e0d6deaa 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(const IObject &object,
+static bool visit_object(const IObject &object,
                          std::vector<AbcObjectReader *> &readers,
                          GHash * readers_map,
                          ImportSettings &settings)
@@ -393,10 +393,9 @@ static int visit_object(const IObject &object,
 	// or a Blender object (empty) themselves.
 	size_t children_claiming_this_object = 0;
 	size_t num_children = object.getNumChildren();
-	BLI_assert((int)true == 1);
 	for (size_t i = 0; i < num_children; ++i) {
 		bool child_claims_this_object = visit_object(object.getChild(i), readers, readers_map, settings);
-		children_claiming_this_object += child_claims_this_object;  // using (int)true == 1
+		children_claiming_this_object += child_claims_this_object ? 1 : 0;
 	}
 
 	AbcObjectReader *reader = NULL;