[Bf-blender-cvs] [a9504580b35] master: Alembic: simplified conditional statements
Sybren A. Stüvel
noreply at git.blender.org
Thu Apr 6 16:52:12 CEST 2017
Commit: a9504580b35ec305931e5c5cb706c5f929f132fd
Author: Sybren A. Stüvel
Date: Thu Feb 23 11:25:42 2017 +0100
Branches: master
https://developer.blender.org/rBa9504580b35ec305931e5c5cb706c5f929f132fd
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 5b7663943c2..cf4372b2f5b 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();
}
/* ************************************************************************** */
More information about the Bf-blender-cvs
mailing list