[Bf-blender-cvs] [b50e880] master: Fix T47565: Crash when adding texture node in compositor

[Sergey Sharybin]

Commit: b50e880e49809118c5a2f8f7ece5cf4b22557a1b
Author: Sergey Sharybin
Date:   Thu Feb 25 20:01:31 2016 +0100
Branches: master
https://developer.blender.org/rBb50e880e49809118c5a2f8f7ece5cf4b22557a1b

Fix T47565: Crash when adding texture node in compositor

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

M	source/blender/compositor/operations/COM_TextureOperation.cpp

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

diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp
index ed8b034..7d1d24a 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();