kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T47565: Crash when adding texture node in compositor

Browse Source
This commit is contained in:
Sergey Sharybin 2016-02-25 20:01:31 +01:00
parent ba98b681e7
commit b50e880e49
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/compositor/operations/COM_TextureOperation.cpp
View File

@ -57,7 +57,10 @@ void TextureBaseOperation::initExecution()
this->m_inputOffset = getInputSocketReader(0); this->m_inputOffset = getInputSocketReader(0);
this->m_inputSize = getInputSocketReader(1); this->m_inputSize = getInputSocketReader(1);
this->m_pool = BKE_image_pool_new(); 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); ntreeTexBeginExecTree(this->m_texture->nodetree);
} }
SingleThreadedOperation::initExecution(); SingleThreadedOperation::initExecution();