diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-25 22:01:31 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-25 22:01:31 +0300 |
| commit | b50e880e49809118c5a2f8f7ece5cf4b22557a1b (patch) | |
| tree | d98ecef7862c6cbd54b3d097136fd92619cc2753 /source/blender/compositor | |
| parent | ba98b681e7e59ed61c8ce68ee8277f401d95e067 (diff) | |
Fix T47565: Crash when adding texture node in compositor
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/operations/COM_TextureOperation.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp index ed8b0343e51..7d1d24a9747 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cpp +++ b/source/blender/compositor/operations/COM_TextureOperation.cpp @@ -57,7 +57,10 @@ void TextureBaseOperation::initExecution() this->m_inputOffset = getInputSocketReader(0); this->m_inputSize = getInputSocketReader(1); this->m_pool = BKE_image_pool_new(); - if (this->m_texture->nodetree && this->m_texture->use_nodes) { + if (this->m_texture != NULL && + this->m_texture->nodetree != NULL && + this->m_texture->use_nodes) + { ntreeTexBeginExecTree(this->m_texture->nodetree); } SingleThreadedOperation::initExecution(); |