[Bf-blender-cvs] [b9895b0fbb3] temp-greasepencil-object-stacksplit: Almost working the modifiers

[Antonio Vazquez]

Commit: b9895b0fbb3ccad0e4b9a8ac8bdfa99cac5dbf20
Author: Antonio Vazquez
Date:   Mon Jun 18 20:10:45 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rBb9895b0fbb3ccad0e4b9a8ac8bdfa99cac5dbf20

Almost working the modifiers

Now it can add, remove copy, move and apply

Still pending in viewport.

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

M	source/blender/editors/interface/interface_templates.c
M	source/blender/editors/object/object_gpencil_modifier.c
M	source/blender/makesrna/intern/rna_greasepencil_modifier.c
M	source/blender/makesrna/intern/rna_ui_api.c

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

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 7445ff421f9..5141c3de13d 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1607,13 +1607,6 @@ static uiLayout *gpencil_draw_modifier(
 		uiItemEnumO(row, "OBJECT_OT_gpencil_modifier_apply", CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Apply"),
 			0, "apply_as", MODIFIER_APPLY_DATA);
 
-		uiItemEnumO(row, "OBJECT_OT_gpencil_modifier_apply",
-			CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Apply as Shape Key"),
-			0, "apply_as", MODIFIER_APPLY_SHAPE);
-
-		UI_block_lock_clear(block);
-		UI_block_lock_set(block, ob && ID_IS_LINKED(ob), ERROR_LIBDATA_MESSAGE);
-
 		uiItemO(row, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Copy"), ICON_NONE,
 			"OBJECT_OT_gpencil_modifier_copy");
 	
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index 535568f0e65..d4afb2867a6 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -528,7 +528,7 @@ void OBJECT_OT_gpencil_modifier_move_up(wmOperatorType *ot)
 {
 	ot->name = "Move Up Modifier";
 	ot->description = "Move modifier up in the stack";
-	ot->idname = "OBJECT_OT_modifier_move_up";
+	ot->idname = "OBJECT_OT_gpencil_modifier_move_up";
 
 	ot->invoke = gpencil_modifier_move_up_invoke;
 	ot->exec = gpencil_modifier_move_up_exec;
@@ -567,7 +567,7 @@ void OBJECT_OT_gpencil_modifier_move_down(wmOperatorType *ot)
 {
 	ot->name = "Move Down Modifier";
 	ot->description = "Move modifier down in the stack";
-	ot->idname = "OBJECT_OT_modifier_move_down";
+	ot->idname = "OBJECT_OT_gpencil_modifier_move_down";
 
 	ot->invoke = gpencil_modifier_move_down_invoke;
 	ot->exec = gpencil_modifier_move_down_exec;
diff --git a/source/blender/makesrna/intern/rna_greasepencil_modifier.c b/source/blender/makesrna/intern/rna_greasepencil_modifier.c
index 86075ade9be..1194da63b29 100644
--- a/source/blender/makesrna/intern/rna_greasepencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_greasepencil_modifier.c
@@ -1220,6 +1220,12 @@ void RNA_def_greasepencil_modifier(BlenderRNA *brna)
 	RNA_def_property_ui_icon(prop, ICON_SCENE, 0);
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, NULL);
 
+	prop = RNA_def_property(srna, "show_in_editmode", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "mode", eGreasePencilModifierMode_Editmode);
+	RNA_def_property_ui_text(prop, "Edit Mode", "Display modifier in Edit mode");
+	RNA_def_property_update(prop, 0, "rna_GreasePencilModifier_update");
+	RNA_def_property_ui_icon(prop, ICON_EDITMODE_HLT, 0);
+	
 	prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", eGreasePencilModifierMode_Expanded);
 	RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index e7aceeaf940..13ae4721537 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -840,7 +840,7 @@ void RNA_api_ui_layout(StructRNA *srna)
 	func = RNA_def_function(srna, "template_greasepencil_modifier", "uiTemplateGreasePencilModifier");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 	RNA_def_function_ui_description(func, "Generates the UI layout for grease pencil modifiers");
-	parm = RNA_def_pointer(func, "data", "Modifier", "", "Modifier data");
+	parm = RNA_def_pointer(func, "data", "GreasePencilModifier", "", "Modifier data");
 	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR);
 	parm = RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to put items in");
 	RNA_def_function_return(func, parm);