[Bf-blender-cvs] [4bba60dedcb] greasepencil-object: Fix error to apply modifier in wrong modes

[Antonio Vazquez]

Commit: 4bba60dedcb3a36a8b6e43f7868fe55a1c5bf320
Author: Antonio Vazquez
Date:   Sun Jul 23 12:33:45 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB4bba60dedcb3a36a8b6e43f7868fe55a1c5bf320

Fix error to apply modifier in wrong modes

The modifier only can be applied in object mode

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

M	source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 61bcb8c0a3d..8e87dfd3fc3 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -702,6 +702,11 @@ int ED_object_modifier_apply(ReportList *reports, const bContext *C, Scene *scen
 		return 0;
 	}
 	else if (ob->type == OB_GPENCIL) {
+		if (ob->mode != OB_MODE_OBJECT) {
+			BKE_report(reports, RPT_ERROR, "Modifiers cannot be applied in paint, sculpt or edit mode");
+			return 0;
+		}
+
 		modifier_apply_obdata(reports, C, scene, ob, md);
 		BLI_remlink(&ob->modifiers, md);
 		modifier_free(md);