[Bf-blender-cvs] [f971481dc9f] greasepencil-object: GPencil: Cleanup unused code

Antonio Vazquez noreply at git.blender.org
Thu Feb 27 18:28:21 CET 2020


Commit: f971481dc9fdda02b31b1ee2ad3148f47b0914c4
Author: Antonio Vazquez
Date:   Thu Feb 27 18:28:14 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBf971481dc9fdda02b31b1ee2ad3148f47b0914c4

GPencil: Cleanup unused code

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

M	source/blender/makesdna/DNA_shader_fx_types.h
M	source/blender/makesrna/intern/rna_shader_fx.c

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

diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h
index 1514912b4cd..e0931d8cac3 100644
--- a/source/blender/makesdna/DNA_shader_fx_types.h
+++ b/source/blender/makesdna/DNA_shader_fx_types.h
@@ -170,10 +170,6 @@ typedef struct PixelShaderFxData {
   ShaderFxData_Runtime runtime;
 } PixelShaderFxData;
 
-typedef enum ePixelShaderFx_Flag {
-  FX_PIXEL_USE_LINES = (1 << 0),
-} ePixelShaderFx_Flag;
-
 typedef struct RimShaderFxData {
   ShaderFxData shaderfx;
   int offset[2];
diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c
index 9823c47e46c..f7f68d535ec 100644
--- a/source/blender/makesrna/intern/rna_shader_fx.c
+++ b/source/blender/makesrna/intern/rna_shader_fx.c
@@ -342,11 +342,6 @@ static void rna_def_shader_fx_pixel(BlenderRNA *brna)
   RNA_def_property_array(prop, 4);
   RNA_def_property_ui_text(prop, "Color", "Color used for lines");
   RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update");
-
-  prop = RNA_def_property(srna, "use_lines", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_boolean_sdna(prop, NULL, "flag", FX_PIXEL_USE_LINES);
-  RNA_def_property_ui_text(prop, "Lines", "Display lines between pixels");
-  RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update");
 }
 
 static void rna_def_shader_fx_rim(BlenderRNA *brna)



More information about the Bf-blender-cvs mailing list