[Bf-blender-cvs] [534f11f] master: Fix T49857: Blender crashes after adding texture node to compositing tree
Sergey Sharybin
noreply at git.blender.org
Thu Nov 3 10:25:49 CET 2016
Commit: 534f11f71ee71b87a17ceddf56da0bcfa2cab352
Author: Sergey Sharybin
Date: Thu Nov 3 10:25:31 2016 +0100
Branches: master
https://developer.blender.org/rB534f11f71ee71b87a17ceddf56da0bcfa2cab352
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 bba5c87..6bfd8ae 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;
}
More information about the Bf-blender-cvs
mailing list