[Bf-blender-cvs] [86288725dfa] master: Alembic import: fall back to linear when variable order array is invalid.

Sybren A. Stüvel noreply at git.blender.org
Tue Apr 18 13:59:06 CEST 2017


Commit: 86288725dfae924c933ba27b17107824aec9c324
Author: Sybren A. Stüvel
Date:   Tue Apr 18 12:19:39 2017 +0200
Branches: master
https://developer.blender.org/rB86288725dfae924c933ba27b17107824aec9c324

Alembic import: fall back to linear when variable order array is invalid.

This seems like more sane behaviour than to keep the orderu at the
invalid default value 0.

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

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

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

diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc
index 58b8d7e05cd..e6a5b289c6b 100644
--- a/source/blender/alembic/intern/abc_curves.cc
+++ b/source/blender/alembic/intern/abc_curves.cc
@@ -258,8 +258,8 @@ void read_curve_sample(Curve *cu, const ICurvesSchema &schema, const float time)
 			case Alembic::AbcGeom::kVariableOrder:
 				if (orders && orders->size() > i) {
 					nu->orderu = static_cast<short>((*orders)[i]);
+					break;
 				}
-				break;
 			case Alembic::AbcGeom::kLinear:
 			default:
 				nu->orderu = 2;




More information about the Bf-blender-cvs mailing list