Commit: b95cd2f97d2f647062e2c2428b24b0120a002deb Author: Antonio Vazquez Date: Thu Apr 12 16:20:14 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rBb95cd2f97d2f647062e2c2428b24b0120a002deb
Fix compiler error after merge =================================================================== M source/blender/editors/gpencil/gpencil_paint.c =================================================================== diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index d6c27c386ce..ced15d5b43a 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1670,7 +1670,7 @@ static bool gp_session_initdata(bContext *C, wmOperator *op, tGPsdata *p) Base *base = BKE_view_layer_base_find(view_layer, obact); if (base) { if (CTX_data_edit_object(C)) - ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO); /* freedata, and undo */ + ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); /* freedata, and undo */ view_layer->basact = base; ED_object_base_activate(C, base); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs