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:
authorCampbell Barton <ideasman42@gmail.com>2012-08-06 16:14:02 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-06 16:14:02 +0400
commit43d855c846d4d9098a36b7ad91da034c95ef8088 (patch)
tree2cea81018993062389fdc89fb01180673127875a /source/blender/editors/space_image
parent75a188272ed13d4c7d5a618e18d18c0828e617c1 (diff)
fix for own bug - missing NULL check when the image space starts a render job
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r--source/blender/editors/space_image/space_image.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 7001677b4d8..cc8940201e2 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -374,9 +374,11 @@ static void image_refresh(const bContext *C, ScrArea *sa)
/* check if we have to set the image from the editmesh */
if (ima && (ima->source == IMA_SRC_VIEWER && sima->mode == SI_MODE_MASK)) {
if (sima->lock) {
- Mask *mask = ED_space_image_get_mask(sima);
- if (mask) {
- ED_node_composite_job(C, scene->nodetree, scene);
+ if (scene->nodetree) {
+ Mask *mask = ED_space_image_get_mask(sima);
+ if (mask) {
+ ED_node_composite_job(C, scene->nodetree, scene);
+ }
}
}
}