[Bf-blender-cvs] [8ba85ddae5b] collada: Cleanup Collada: Change variable name from sample to matrix

Gaia Clary noreply at git.blender.org
Fri Mar 30 18:40:38 CEST 2018


Commit: 8ba85ddae5b1578bb1c87745e0583ad8451ff370
Author: Gaia Clary
Date:   Fri Mar 30 15:32:29 2018 +0200
Branches: collada
https://developer.blender.org/rB8ba85ddae5b1578bb1c87745e0583ad8451ff370

Cleanup Collada: Change variable name from sample to matrix

this was a leftover from a previous cleanup where i separated
the old BCSample into 2 classes BCSample and BCMatrix

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

M	source/blender/collada/BCAnimationCurveContainer.cpp

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

diff --git a/source/blender/collada/BCAnimationCurveContainer.cpp b/source/blender/collada/BCAnimationCurveContainer.cpp
index 0bd59bd3f1f..7dd98926ebf 100644
--- a/source/blender/collada/BCAnimationCurveContainer.cpp
+++ b/source/blender/collada/BCAnimationCurveContainer.cpp
@@ -758,11 +758,12 @@ const int BCSampleFrames::get_matrices(Object *ob, BCMatrixSampleMap &samples) c
 {
 	samples.clear(); // safety;
 	BCSampleFrameMap::const_iterator it;
+	float *qref = nullptr; // needed only when decomposing
 	for (it = sample_frames.begin(); it != sample_frames.end(); ++it) {
 		const BCSampleFrame &frame = it->second;
-		const BCMatrix *sample = frame.get_sample_matrix(ob);
-		if (sample) {
-			samples[it->first] = sample;
+		const BCMatrix *matrix = frame.get_sample_matrix(ob);
+		if (matrix) {
+			samples[it->first] = matrix;
 		}
 	}
 	return samples.size();



More information about the Bf-blender-cvs mailing list