[Bf-blender-cvs] [b1d6f6e3c3e] greasepencil-object: Cleanup: Remove unused code

Antonio Vazquez noreply at git.blender.org
Fri Oct 20 19:39:44 CEST 2017


Commit: b1d6f6e3c3e48324679b7d8ebb74d71f1d235457
Author: Antonio Vazquez
Date:   Fri Oct 20 19:39:35 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb1d6f6e3c3e48324679b7d8ebb74d71f1d235457

Cleanup: Remove unused code

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

M	source/blender/blenkernel/intern/gpencil_modifier.c
M	source/blender/makesrna/intern/rna_palette.c

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

diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 6f967569b37..b1b59865fcd 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -698,15 +698,6 @@ bool BKE_gpencil_use_this_lattice(Object *ob, Object *UNUSED(lattice))
 	if (md) {
 		return true;
 	}
-#if 0
-	GpencilLatticeModifierData *mmd = NULL;
-	if (md) {
-		mmd = (GpencilLatticeModifierData *)md;
-		if (lattice == mmd->object) {
-			return true;
-		}
-	}
-#endif
 	return false;
 }
 
diff --git a/source/blender/makesrna/intern/rna_palette.c b/source/blender/makesrna/intern/rna_palette.c
index 78af9bc9c48..24439d07b98 100644
--- a/source/blender/makesrna/intern/rna_palette.c
+++ b/source/blender/makesrna/intern/rna_palette.c
@@ -413,15 +413,6 @@ static void rna_def_palettecolor(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Pass Index", "Index number for the \"Color Index\" pass");
 	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
 
-#if 0   /* integrated as stroke style */
-	/* Draw Style */
-	prop = RNA_def_property(srna, "use_volumetric_strokes", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", PAC_COLOR_VOLUMETRIC);
-	RNA_def_property_ui_text(prop, "Volumetric Strokes", "Draw strokes as a series of circular blobs, resulting in "
-		"a volumetric effect");
-	RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
-#endif
-
 	/* stroke style */
 	prop = RNA_def_property(srna, "stroke_style", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "stroke_style");



More information about the Bf-blender-cvs mailing list