[Bf-blender-cvs] [cb14c2f7f76] rigid_deform: anchor_group_name property

[Jacques Lucke]

Commit: cb14c2f7f76f77850263c91ac9f06b979148feb3
Author: Jacques Lucke
Date:   Sun Dec 9 12:07:51 2018 +0100
Branches: rigid_deform
https://developer.blender.org/rBcb14c2f7f76f77850263c91ac9f06b979148feb3

anchor_group_name property

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py 
b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 1401461b091..8e31e7d6961 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1634,7 +1634,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.prop(md, "face_influence")
 
     def RIGID_DEFORM(self, layout, ob, md):
-        layout.label(text="Hello World")
+        layout.prop_search(md, "anchor_group_name", ob, "vertex_groups", 
text="Anchors")
 
 
 class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
diff --git a/source/blender/makesdna/DNA_modifier_types.h 
b/source/blender/makesdna/DNA_modifier_types.h
index eaa585ecf95..02eabdc04b6 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1950,6 +1950,7 @@ enum {
 
 typedef struct RigidDeformModifierData {
        ModifierData modifier;
+       char anchor_group_name[64];  /* MAX_VGROUP_NAME */
 } RigidDeformModifierData;
 
 #endif  /* __DNA_MODIFIER_TYPES_H__ */
diff --git a/source/blender/makesrna/intern/rna_modifier.c 
b/source/blender/makesrna/intern/rna_modifier.c
index 32e9d8c3c3d..7cdc96fe9b3 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -518,6 +518,7 @@ RNA_MOD_VGROUP_NAME_SET(Shrinkwrap, vgroup_name);
 RNA_MOD_VGROUP_NAME_SET(SimpleDeform, vgroup_name);
 RNA_MOD_VGROUP_NAME_SET(Smooth, defgrp_name);
 RNA_MOD_VGROUP_NAME_SET(Solidify, defgrp_name);
+RNA_MOD_VGROUP_NAME_SET(RigidDeform, anchor_group_name);
 RNA_MOD_VGROUP_NAME_SET(UVWarp, vgroup_name);
 RNA_MOD_VGROUP_NAME_SET(Warp, defgrp_name);
 RNA_MOD_VGROUP_NAME_SET(Wave, defgrp_name);
@@ -5072,12 +5073,17 @@ static void rna_def_modifier_weightednormal(BlenderRNA 
*brna)
 static void rna_def_modifier_rigiddeform(BlenderRNA *brna)
 {
        StructRNA *srna;
-       PropertyRNA *UNUSED(prop);
+       PropertyRNA *prop;
 
        srna = RNA_def_struct(brna, "RigidDeformModifier", "Modifier");
        RNA_def_struct_ui_text(srna, "Rigid Deform Modifier", "");
        RNA_def_struct_sdna(srna, "RigidDeformModifierData");
        RNA_def_struct_ui_icon(srna, ICON_NONE);
+
+       prop = RNA_def_property(srna, "anchor_group_name", PROP_STRING, 
PROP_NONE);
+       RNA_def_property_ui_text(prop, "Vertex Group for Anchors",
+           "Name of the vertex group which determines anchors");
+       RNA_def_property_string_funcs(prop, NULL, NULL, 
"rna_RigidDeformModifier_anchor_group_name_set");
 }
 
 void RNA_def_modifier(BlenderRNA *brna)

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