Commit: 44ffbcd254009fcff2575eb99e0dafe9cbf2ae51
Author: Sergey Sharybin
Date: Thu Nov 3 10:25:31 2016 +0100
Branches: blender-v2.78b-release
https://developer.blender.org/rB44ffbcd254009fcff2575eb99e0dafe9cbf2ae51
Fix T49857: Blender crashes after adding texture node to compositing tree
===================================================================
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 bba5c8702b..6bfd8ae388 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.cpp
+++ b/source/blender/compositor/operations/COM_TextureOperation.cpp
@@ -118,7 +118,7 @@ void TextureBaseOperation::executePixelSampled(float
output[4], float x, float y
* interpolaiton and (b) in such configuration multitex() sinply
floor's the value
* which often produces artifacts.
*/
- if ((m_texture->imaflag & TEX_INTERPOL) == 0) {
+ if (m_texture != NULL && (m_texture->imaflag & TEX_INTERPOL) == 0) {
u += 0.5f / cx;
v += 0.5f / cy;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs