[Bf-blender-cvs] [d6d0fbf8242] greasepencil-object: Remove Undo flag

Antonio Vazquez noreply at git.blender.org
Sat Dec 30 19:44:24 CET 2017


Commit: d6d0fbf82420b720e1e50c19c1407182c62c0969
Author: Antonio Vazquez
Date:   Sat Dec 30 19:28:23 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd6d0fbf82420b720e1e50c19c1407182c62c0969

Remove Undo flag

===================================================================

M	source/blender/editors/gpencil/gpencil_fill.c

===================================================================

diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index daa8862f025..42acf010c26 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -894,7 +894,9 @@ static int gpencil_fill_modal(bContext *C, wmOperator *op, const wmEvent *event)
 #if 0				/* delete temp image */
 				if (tgpf->ima) {
 					BKE_image_free(tgpf->ima);
-				}
+					MEM_SAFE_FREE(tgpf->ima);
+					tgpf->ima = NULL;
+			}
 #endif
 				/* free temp stack data */
 				if (tgpf->stack) {
@@ -945,5 +947,6 @@ void GPENCIL_OT_fill(wmOperatorType *ot)
 	ot->cancel = gpencil_fill_cancel;
 
 	/* flags */
-	ot->flag = OPTYPE_UNDO | OPTYPE_BLOCKING;
+	/* XXX: The undo is not working */
+	ot->flag = OPTYPE_BLOCKING;
 }



More information about the Bf-blender-cvs mailing list