[Bf-blender-cvs] [0669f084379] greasepencil-object: Rename Bled Layers to Layers Blending

[Antonioya]

Commit: 0669f0843795c09528f1174b6529cc732760101f
Author: Antonioya
Date:   Mon Nov 26 11:15:37 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB0669f0843795c09528f1174b6529cc732760101f

Rename Bled Layers to Layers Blending

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

M	release/scripts/startup/bl_ui/properties_render.py
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 8952229b323..8cfbb09ad04 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -660,7 +660,7 @@ class RENDER_PT_simplify_greasepencil(RenderButtonsPanel, Panel):
         col.prop(rd, "simplify_gpencil_onplay", text="Playback Only")
         col.prop(rd, "simplify_gpencil_view_modifier", text="Modifiers")
         col.prop(rd, "simplify_gpencil_shader_fx", text="ShaderFX")
-        col.prop(rd, "simplify_gpencil_blend", text="Blend Layers")
+        col.prop(rd, "simplify_gpencil_blend", text="Layers Blending")
 
         col.prop(rd, "simplify_gpencil_view_fill")
         sub = col.column()
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index d1fef1b9a2f..9d943dca9ec 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -5346,7 +5346,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "simplify_gpencil_blend", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "simplify_gpencil", SIMPLIFY_GPENCIL_BLEND);
-	RNA_def_property_ui_text(prop, "Blend Layers", "Do not display blend layers");
+	RNA_def_property_ui_text(prop, "Layers Blending", "Do not display blend layers");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
 	/* persistent data */