[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50114] trunk/blender/source/blender/ editors/space_image/space_image.c: fix for glitch with mask refresh in the image view when lock was disabled - it would never update the image , (now check G.moving)

[Campbell Barton]

Revision: 50114
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50114
Author:   campbellbarton
Date:     2012-08-22 13:03:54 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
fix for glitch with mask refresh in the image view when lock was disabled - it 
would never update the image, (now check G.moving)

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-22 12:04:27 UTC (rev 50113)
+++ trunk/blender/source/blender/editors/space_image/space_image.c      
2012-08-22 13:03:54 UTC (rev 50114)
@@ -42,6 +42,7 @@
 #include "BKE_colortools.h"
 #include "BKE_context.h"
 #include "BKE_image.h"
+#include "BKE_global.h"
 #include "BKE_scene.h"
 #include "BKE_screen.h"
 #include "BKE_tessmesh.h"
@@ -373,7 +374,10 @@
        
        /* 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) {
+               if (sima->lock == FALSE && G.moving) {
+                       /* pass */
+               }
+               else {
                        if (scene->nodetree) {
                                Mask *mask = ED_space_image_get_mask(sima);
                                if (mask) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs