[Bf-blender-cvs] [bc0208f13c] temp-sybren-alembic: Alembic: simplified conditional statements

[Sybren A. Stüvel]

Commit: bc0208f13ccaf44ab4b835f6b1a834be1f1268e9
Author: Sybren A. Stüvel
Date:   Thu Feb 23 11:25:42 2017 +0100
Branches: temp-sybren-alembic
https://developer.blender.org/rBbc0208f13ccaf44ab4b835f6b1a834be1f1268e9

Alembic: simplified conditional statements

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

M	source/blender/alembic/intern/abc_object.h

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

diff --git a/source/blender/alembic/intern/abc_object.h b/source/blender/alembic/intern/abc_object.h
index 5b7663943c..cf4372b2f5 100644
--- a/source/blender/alembic/intern/abc_object.h
+++ b/source/blender/alembic/intern/abc_object.h
@@ -117,15 +117,7 @@ struct ImportSettings {
 template <typename Schema>
 static bool has_animations(Schema &schema, ImportSettings *settings)
 {
-	if (settings->is_sequence) {
-		return true;
-	}
-
-	if (!schema.isConstant()) {
-		return true;
-	}
-
-	return false;
+	return settings->is_sequence || !schema.isConstant();
 }
 
 /* ************************************************************************** */