blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

GP: Only check annotation origin for 3D View

This commit is contained in:
Antonio Vazquez 2018-09-26 16:25:11 +02:00
parent 1cdf136846
commit e16afa5c73
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/gpencil/annotate_paint.c
View File

@ -1862,14 +1862,17 @@ static int gpencil_draw_exec(bContext *C, wmOperator *op)
static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
Object *ob = CTX_data_active_object(C);
ScrArea *sa = CTX_wm_area(C);
tGPsdata *p = NULL;
/* GPXX Need a better solution */
if ((ob != NULL) && (ob->type == OB_GPENCIL)) {
BKE_report(op->reports, RPT_ERROR, "Cannot draw annotation with a Grease Pencil object active");
return OPERATOR_CANCELLED;
if (sa && sa->spacetype == SPACE_VIEW3D)
{
if ((ob != NULL) && (ob->type == OB_GPENCIL)) {
BKE_report(op->reports, RPT_ERROR, "Cannot draw annotation with a Grease Pencil object active");
return OPERATOR_CANCELLED;
}
}
if (G.debug & G_DEBUG)
printf("GPencil - Starting Drawing\n");