Added the functionality to make a copy of the active modifier in the Parameter Editor mode.

Code contribution by flokkievids.  Thank you!

4 files changed, 54 insertions, 0 deletions

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index a4393fbd8ea..f034a458c6e 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -373,6 +373,7 @@ class RENDER_PT_freestyle_linestyle(RenderButtonsPanel, Panel):
         row.label(text=modifier.rna_type.name)
         row.prop(modifier, "name", text="")
         row.prop(modifier, "use", text="")
+        row.operator("scene.freestyle_modifier_copy", icon='NONE', text="Copy")
         sub = row.row(align=True)
         sub.operator("scene.freestyle_modifier_move", icon='TRIA_UP', text="").direction = 'UP'
         sub.operator("scene.freestyle_modifier_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h
index eb240d4071e..40d0c9536f4 100644
--- a/source/blender/editors/render/render_intern.h
+++ b/source/blender/editors/render/render_intern.h
@@ -68,6 +68,7 @@ void SCENE_OT_freestyle_thickness_modifier_add(struct wmOperatorType *ot);
 void SCENE_OT_freestyle_geometry_modifier_add(struct wmOperatorType *ot);
 void SCENE_OT_freestyle_modifier_remove(struct wmOperatorType *ot);
 void SCENE_OT_freestyle_modifier_move(struct wmOperatorType *ot);
+void SCENE_OT_freestyle_modifier_copy(struct wmOperatorType *ot);
 
 
 void TEXTURE_OT_slot_copy(struct wmOperatorType *ot);
diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c
index f94d94178a4..eb9a4cb30e4 100644
--- a/source/blender/editors/render/render_ops.c
+++ b/source/blender/editors/render/render_ops.c
@@ -77,6 +77,7 @@ void ED_operatortypes_render(void)
 	WM_operatortype_append(SCENE_OT_freestyle_geometry_modifier_add);
 	WM_operatortype_append(SCENE_OT_freestyle_modifier_remove);
 	WM_operatortype_append(SCENE_OT_freestyle_modifier_move);
+	WM_operatortype_append(SCENE_OT_freestyle_modifier_copy);
 
 #if (defined(WITH_QUICKTIME) && !defined(USE_QTKIT))
 	WM_operatortype_append(SCENE_OT_render_data_set_quicktime_codec);
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index 05d62d0b32d..53f395f494b 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -1075,6 +1075,57 @@ void SCENE_OT_freestyle_modifier_remove(wmOperatorType *ot)
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
+static int freestyle_modifier_copy_exec(bContext *C, wmOperator *op)
+{
+    Scene *scene= CTX_data_scene(C);
+    SceneRenderLayer *srl = (SceneRenderLayer*) BLI_findlink(&scene->r.layers, scene->r.actlay);
+    FreestyleLineSet *lineset = FRS_get_active_lineset(&srl->freestyleConfig);
+    PointerRNA ptr= CTX_data_pointer_get_type(C, "modifier", &RNA_LineStyleModifier);
+    LineStyleModifier *modifier= ptr.data;
+
+    if (!lineset) {
+        BKE_report(op->reports, RPT_ERROR, "No active lineset and associated line style the modifier belongs to.");
+        return OPERATOR_CANCELLED;
+    }
+
+    switch (freestyle_get_modifier_type(&ptr)) {
+    case LS_MODIFIER_TYPE_COLOR:
+        FRS_copy_linestyle_color_modifier(lineset->linestyle, modifier);
+        break;
+    case LS_MODIFIER_TYPE_ALPHA:
+        FRS_copy_linestyle_alpha_modifier(lineset->linestyle, modifier);
+        break;
+    case LS_MODIFIER_TYPE_THICKNESS:
+        FRS_copy_linestyle_thickness_modifier(lineset->linestyle, modifier);
+        break;
+    case LS_MODIFIER_TYPE_GEOMETRY:
+        FRS_copy_linestyle_geometry_modifier(lineset->linestyle, modifier);
+        break;
+    default:
+        BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier.");
+        return OPERATOR_CANCELLED;
+    }
+    WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS, scene);
+
+    return OPERATOR_FINISHED;
+
+}
+
+void SCENE_OT_freestyle_modifier_copy(wmOperatorType *ot)
+{
+    /* identifiers */
+    ot->name= "Copy Modifier";
+    ot->idname= "SCENE_OT_freestyle_modifier_copy";
+    ot->description="Duplicate the modifier within the list of modifiers";
+
+    /* api callbacks */
+    ot->exec= freestyle_modifier_copy_exec;
+    ot->poll= freestyle_active_lineset_poll;
+
+    /* flags */
+    ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
 static int freestyle_modifier_move_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);