[Bf-blender-cvs] [879a77b08b6] greasepencil-object: Remove view_layer option for render (F12)

[Antonio Vazquez]

Commit: 879a77b08b6ec760e69abb788ce038dc22c36b3e
Author: Antonio Vazquez
Date:   Sat May 12 18:57:51 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB879a77b08b6ec760e69abb788ce038dc22c36b3e

Remove view_layer option for render (F12)

This option allowed to filter a grease pencil layer by view layer, but after merge review it was decided to remove.

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

M	release/scripts/startup/bl_ui/properties_data_gpencil.py
M	source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M	source/blender/makesdna/DNA_gpencil_types.h
M	source/blender/makesrna/intern/rna_gpencil.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 5069197334d..69e70e1e224 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -184,12 +184,6 @@ class DATA_PT_gpencil_parentpanel(LayerDataButtonsPanel, Panel):
         if parent and gpl.parent_type == 'BONE' and parent.type == 'ARMATURE':
             sub.prop_search(gpl, "parent_bone", parent.data, "bones", text="")
 
-        row = layout.row()
-        row.label("Render Settings:")
-        row = layout.row(align=True)
-        row.prop_search(gpl, "view_layer", scene, "view_layers", text="View Layer")
-        row.prop(gpl, "invert_view_layer", text="", icon='ARROW_LEFTRIGHT')
-
 
 class GPENCIL_UL_vgroups(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index d4f93b9b7af..6d55b6c63fe 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1145,26 +1145,6 @@ void DRW_gpencil_populate_datablock(GPENCIL_e_data *e_data, void *vedata, Scene
 		if (gpl->flag & GP_LAYER_HIDE)
 			continue;
 
-		/* don't draw layer if render (F12) and the view layer is not equal */
-		if ((!DRW_state_is_opengl_render()) && (stl->storage->is_render)) {
-			if (gpl->view_layer != NULL) {
-				/* the view layer must exist otherwise the filter is ignored */
-				ViewLayer *view = BLI_findstring(&scene->view_layers, gpl->view_layer, offsetof(ViewLayer, name));
-				if (view != NULL) {
-					if (gpl->flag & GP_LAYER_INVERT_VIEWLAYER) {
-						if (STREQ(gpl->view_layer, draw_ctx->view_layer->name)) {
-							continue;
-						}
-					}
-					else {
-						if (!STREQ(gpl->view_layer, draw_ctx->view_layer->name)) {
-							continue;
-						}
-					}
-				}
-			}
-		}
-
 		bGPDframe *gpf = BKE_gpencil_layer_getframe(gpl, CFRA, 0);
 		if (gpf == NULL)
 			continue;
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index bd53fb6ce1c..02f2e456082 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -274,8 +274,6 @@ typedef struct bGPDlayer {
 	int onion_flag;         /* Per-layer onion-skinning flags, to overide datablock settings (eGPDlayer_OnionFlag) */
 	float onion_factor;     /* onion alpha factor change */
 	
-	char view_layer[64];    /* optional view layer name for filter for render (F12) */
-	
 	struct GHash *derived_data;     /* runtime data created by modifiers */
 } bGPDlayer;
 
@@ -296,8 +294,6 @@ typedef enum eGPDlayer_Flag {
 	GP_LAYER_FRAMELOCK		= (1 << 6),
 	/* don't render xray (which is default) */
 	GP_LAYER_NO_XRAY		= (1 << 7),
-	/* inverse view layer filter */
-	GP_LAYER_INVERT_VIEWLAYER = (1 << 8),
 	/* "volumetric" strokes */
 	GP_LAYER_VOLUMETRIC		= (1 << 10),
 	/* Unlock color */
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 7576b660e94..48b72d0b68e 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1085,17 +1085,6 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
 		"When draw new strokes in 3D view, use last stroke origin, as new stroke origin");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 	
-	/* Render View Layer */
-	prop = RNA_def_property(srna, "view_layer", PROP_STRING, PROP_NONE);
-	RNA_def_property_ui_text(prop, "View Layer", 
-		"Include this layer only in this view layer when render (empty to include in all view layers)");
-	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);
-
-	prop = RNA_def_property(srna, "invert_view_layer", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_INVERT_VIEWLAYER);
-	RNA_def_property_ui_text(prop, "Invert", "Invert view layer filter");
-	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);
-
 	/* Flags */
 	prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_HIDE);