[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36018] trunk/blender/source/blender/ editors/gpencil/gpencil_edit.c: fix [#26793] Is the Convert function of Grease Pencil normal?

[Campbell Barton]

Revision: 36018
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36018
Author:   campbellbarton
Date:     2011-04-05 08:54:13 +0000 (Tue, 05 Apr 2011)
Log Message:
-----------
fix [#26793] Is the Convert function of Grease Pencil normal?
disallow grease pencil conversion in editmode, was setting a new active object.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/gpencil/gpencil_edit.c

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-04-05 
08:43:16 UTC (rev 36017)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-04-05 
08:54:13 UTC (rev 36018)
@@ -549,9 +549,10 @@
 {
        bGPdata *gpd= gpencil_data_get_active(C);
        ScrArea *sa= CTX_wm_area(C);
+       Scene *scene= CTX_data_scene(C);
 
        /* only if there's valid data, and the current view is 3D View */
-       return ((sa && sa->spacetype == SPACE_VIEW3D) && 
gpencil_layer_getactive(gpd));
+       return ((sa && sa->spacetype == SPACE_VIEW3D) && 
gpencil_layer_getactive(gpd) && (scene->obedit == NULL));
 }
 
 static int gp_convert_layer_exec (bContext *C, wmOperator *op)

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