diff options
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/operations/COM_ColorRampOperation.cpp | 4 | ||||
| -rw-r--r-- | source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.cpp b/source/blender/compositor/operations/COM_ColorRampOperation.cpp index 84d36034ec6..c67f906b374 100644 --- a/source/blender/compositor/operations/COM_ColorRampOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorRampOperation.cpp @@ -25,7 +25,7 @@ #ifdef __cplusplus extern "C" { #endif -# include "BKE_texture.h" +# include "BKE_colorband.h" #ifdef __cplusplus } #endif @@ -48,7 +48,7 @@ void ColorRampOperation::executePixelSampled(float output[4], float x, float y, float values[4]; this->m_inputProgram->readSampled(values, x, y, sampler); - do_colorband(this->m_colorBand, values[0], output); + BKE_colorband_evaluate(this->m_colorBand, values[0], output); } void ColorRampOperation::deinitExecution() diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp index 0c2da8415f8..5d682352d46 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp @@ -35,6 +35,9 @@ MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation() void MovieClipAttributeOperation::initExecution() { + if (this->m_clip == NULL) { + return; + } float loc[2], scale, angle; loc[0] = 0.0f; loc[1] = 0.0f; |