Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-11-03 12:25:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-01-24 13:54:39 +0300
commit44ffbcd254009fcff2575eb99e0dafe9cbf2ae51 (patch)
tree344eaa6796fe54e1e9fcaaa9017845e8d4883139
parentf8a3b9b50c65395e4df514b2fbdf16fe8b4771ca (diff)
Fix T49857: Blender crashes after adding texture node to compositing tree
-rw-r--r--source/blender/compositor/operations/COM_TextureOperation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp
index bba5c8702b8..6bfd8ae3888 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;
}