diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-05 12:54:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-05 12:54:13 +0400 |
| commit | 1f45f5c15d542fb0f17ea8debc86b0af22f4dfdb (patch) | |
| tree | 437ccfa4c86ac1d636cc54c62e362e79613432c7 /source/blender/editors/gpencil | |
| parent | 61933ec4b949375a13b2671ddd7e1883d0259e24 (diff) | |
fix [#26793] Is the Convert function of Grease Pencil normal?
disallow grease pencil conversion in editmode, was setting a new active object.
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index e9154b59ebf..31e0324f0aa 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -549,9 +549,10 @@ static int gp_convert_poll (bContext *C) { 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) |