[Bf-blender-cvs] [328eacc] strand_gpu: Flag for enabling control strand display.

[Lukas Tönne]

Commit: 328eacc5f172c16f2affbcdcc432552f914c549f
Author: Lukas Tönne
Date:   Wed Jun 29 11:08:23 2016 +0200
Branches: strand_gpu
https://developer.blender.org/rB328eacc5f172c16f2affbcdcc432552f914c549f

Flag for enabling control strand display.

Currently still unused.

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

M       release/scripts/startup/bl_ui/properties_data_modifier.py
M       source/blender/makesdna/DNA_modifier_types.h
M       source/blender/makesrna/intern/rna_modifier.c
M       source/blender/modifiers/intern/MOD_strands.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py 
b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 4fc2846..5634d49 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -880,7 +880,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         row.prop(md, "material_offset_rim", text="Rim")
 
     def STRANDS(self, layout, ob, md):
-        pass
+        split = layout.split()
+        col = split.column()
+        col.label(text="Display:")
+        col.prop(md, "show_control_strands", text="Control Strands")
 
     def SUBSURF(self, layout, ob, md):
         layout.row().prop(md, "subdivision_type", expand=True)
diff --git a/source/blender/makesdna/DNA_modifier_types.h 
b/source/blender/makesdna/DNA_modifier_types.h
index 2e4d54a..c186713 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1548,7 +1548,15 @@ enum {
 typedef struct StrandsModifierData {
        ModifierData modifier;
        
+       int flag;
+       int pad;
+       
        struct Strands *strands;
 } StrandsModifierData;
 
+/* StrandsModifierData.flag */
+enum {
+       MOD_STRANDS_SHOW_CONTROL_STRANDS = (1 << 0),
+};
+
 #endif  /* __DNA_MODIFIER_TYPES_H__ */
diff --git a/source/blender/makesrna/intern/rna_modifier.c 
b/source/blender/makesrna/intern/rna_modifier.c
index c7b96b7..ac54fe8 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -4652,7 +4652,11 @@ static void rna_def_modifier_strands(BlenderRNA *brna)
        RNA_def_struct_sdna(srna, "StrandsModifierData");
        RNA_def_struct_ui_icon(srna, ICON_STRANDS);
        
-       UNUSED_VARS(prop);
+       prop = RNA_def_property(srna, "show_control_strands", PROP_BOOLEAN, 
PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "flag", 
MOD_STRANDS_SHOW_CONTROL_STRANDS);
+       RNA_def_property_boolean_default(prop, true);
+       RNA_def_property_ui_text(prop, "Show Control Strands", "Show control 
strand curves");
+       RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
 void RNA_def_modifier(BlenderRNA *brna)
diff --git a/source/blender/modifiers/intern/MOD_strands.c 
b/source/blender/modifiers/intern/MOD_strands.c
index 79b2125..1aae0f3 100644
--- a/source/blender/modifiers/intern/MOD_strands.c
+++ b/source/blender/modifiers/intern/MOD_strands.c
@@ -55,6 +55,8 @@ static void initData(ModifierData *md)
        StrandsModifierData *smd = (StrandsModifierData *) md;
        
        smd->strands = BKE_strands_new();
+       
+       smd->flag |= MOD_STRANDS_SHOW_CONTROL_STRANDS;
 }
 
 static void copyData(ModifierData *md, ModifierData *target)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs