Revision: 49612
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49612
Author:   campbellbarton
Date:     2012-08-06 12:14:02 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
fix for own bug - missing NULL check when the image space starts a render job

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/space_image.c

Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c      
2012-08-06 12:12:45 UTC (rev 49611)
+++ trunk/blender/source/blender/editors/space_image/space_image.c      
2012-08-06 12:14:02 UTC (rev 49612)
@@ -374,9 +374,11 @@
        /* 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);
+                               }
                        }
                }
        }

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to