diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:53 +0300 |
| commit | 059c119719e04283808d3c7076886e1a58874f6b (patch) | |
| tree | 5296776b81111ef62e33687d4a9b4c6ab5e297ff /source/blender/collada/BCAnimationSampler.cpp | |
| parent | fa0fcbe4d6ca3f183f02395fe9ba18fb5ea87748 (diff) | |
| parent | e742e0934de6384eeaf271ca4cfe99922ddbe3fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/BCAnimationSampler.cpp')
| -rw-r--r-- | source/blender/collada/BCAnimationSampler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/collada/BCAnimationSampler.cpp index e73656976ca..5c0c1b4316d 100644 --- a/source/blender/collada/BCAnimationSampler.cpp +++ b/source/blender/collada/BCAnimationSampler.cpp @@ -317,7 +317,7 @@ bool BCAnimationSampler::get_object_samples(BCMatrixSampleMap &samples, Object * #if 0 /* - Add sampled values to FCurve + Add sampled values to FCurve If no FCurve exists, create a temporary FCurve; Note: The temporary FCurve will later be removed when the BCAnimationSampler is removed (by its destructor) @@ -352,7 +352,7 @@ void BCAnimationSampler::add_value_set( else { good = sample->get_value(tm_type, array_index, &val, subindex); } - + if (good) { curve.add_value(val, frame_index); } |