[Bf-blender-cvs] [b0c08068e86] greasepencil-object: Remove simplify render options

[Antonio Vazquez]

Commit: b0c08068e867ea15ca50739ee7258a7cff8b583e
Author: Antonio Vazquez
Date:   Sat Jan 20 13:18:19 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb0c08068e867ea15ca50739ee7258a7cff8b583e

Remove simplify render options

This options are not necessary because for render and viewport use the same options

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

M	release/scripts/startup/bl_ui/properties_scene.py
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index f388b672b15..d778a8a1954 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -461,20 +461,11 @@ class SCENE_PT_gp_simplify(SceneButtonsPanel, Panel):
         split = layout.split()
 
         col = split.column()
-        col.label(text="Viewport:")
         col.prop(ts, "gpencil_simplify_view_fill", text="Fill")
         col.prop(ts, "gpencil_simplify_remove_lines", text="Remove Fill Lines")
         col.prop(ts, "gpencil_simplify_view_modifier", text="Modifiers")
         col.prop(ts, "gpencil_simplify_view_vfx", text="VFX")
 
-        col = split.column()
-        # TODO: keep disable while render workflow is defined
-        col.active = False
-        col.label(text="Render:")
-        col.prop(ts, "gpencil_simplify_render_fill", text="Fill")
-        col.prop(ts, "gpencil_simplify_render_modifier", text="Modifiers")
-        col.prop(ts, "gpencil_simplify_render_vfx", text="VFX")
-
         row = layout.row()
         row.prop(ts, "gpencil_disable_fast_drawing")
 
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 4551cb9c3cc..abfdcd0d8ab 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -2229,12 +2229,6 @@ typedef enum eGPencil_SimplifyFlags {
 	GP_TOOL_FLAG_SIMPLIFY_VIEW_MODIF = (1 << 3),
 	/* Simplify vfx modifier on viewport */
 	GP_TOOL_FLAG_SIMPLIFY_VIEW_VFX = (1 << 4),
-	/* Simplify fill on render */
-	GP_TOOL_FLAG_SIMPLIFY_RENDER_FILL = (1 << 5),
-	/* Simplify modifier on render */
-	GP_TOOL_FLAG_SIMPLIFY_RENDER_MODIF = (1 << 6),
-	/* Simplify vfx modifier on render */
-	GP_TOOL_FLAG_SIMPLIFY_RENDER_VFX = (1 << 7),
 	/* Remove fill external line */
 	GP_TOOL_FLAG_SIMPLIFY_REMOVE_LINE = (1 << 8),
 	/* Disable fast drawing */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index e7779881a7c..28204616142 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2836,21 +2836,6 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 	RNA_def_property_ui_text(prop, "Fill", "Do not apply VFX modifiers on viewport");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
-	prop = RNA_def_property(srna, "gpencil_simplify_render_fill", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "gpencil_simplify", GP_TOOL_FLAG_SIMPLIFY_RENDER_FILL);
-	RNA_def_property_ui_text(prop, "Fill", "Do not fill strokes on render");
-	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
-
-	prop = RNA_def_property(srna, "gpencil_simplify_render_modifier", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "gpencil_simplify", GP_TOOL_FLAG_SIMPLIFY_RENDER_MODIF);
-	RNA_def_property_ui_text(prop, "Fill", "Do not apply modifiers on render");
-	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
-
-	prop = RNA_def_property(srna, "gpencil_simplify_render_vfx", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "gpencil_simplify", GP_TOOL_FLAG_SIMPLIFY_RENDER_VFX);
-	RNA_def_property_ui_text(prop, "Fill", "Do not apply VFX modifiers on render");
-	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
-
 	prop = RNA_def_property(srna, "gpencil_disable_fast_drawing", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "gpencil_simplify", GP_TOOL_FLAG_DISABLE_FAST_DRAWING);
 	RNA_def_property_ui_text(prop, "Disable Fast Drawing", "Disable fast drawing while painting");