[Bf-blender-cvs] [9a6dab3] hair_system: Removed the debug "smoothing" factor.
Lukas Tönne
noreply at git.blender.org
Thu Aug 7 12:26:23 CEST 2014
Commit: 9a6dab3ebe33dd03188ae1ff1504d63493aac4a4
Author: Lukas Tönne
Date: Thu Aug 7 12:26:47 2014 +0200
Branches: hair_system
https://developer.blender.org/rB9a6dab3ebe33dd03188ae1ff1504d63493aac4a4
Removed the debug "smoothing" factor.
===================================================================
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/makesdna/DNA_hair_types.h
M source/blender/makesrna/intern/rna_hair.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 6c6c126..1e88111 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1227,10 +1227,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
params = hsys.params
col = layout.column()
- col.prop(hsys, "smooth")
-
- col.separator()
-
row = col.row()
col2 = row.column()
col2.prop(params, "stretch_stiffness")
diff --git a/source/blender/makesdna/DNA_hair_types.h b/source/blender/makesdna/DNA_hair_types.h
index e65f21f..f1a0c77 100644
--- a/source/blender/makesdna/DNA_hair_types.h
+++ b/source/blender/makesdna/DNA_hair_types.h
@@ -65,10 +65,6 @@ typedef struct HairSystem {
int pad;
HairParams params;
-
- /* testing */
- float smooth;
- int pad2;
} HairSystem;
#endif
diff --git a/source/blender/makesrna/intern/rna_hair.c b/source/blender/makesrna/intern/rna_hair.c
index 36bf111..1b4edae 100644
--- a/source/blender/makesrna/intern/rna_hair.c
+++ b/source/blender/makesrna/intern/rna_hair.c
@@ -45,10 +45,12 @@
#include "WM_api.h"
+#if 0 /* unused */
static void rna_HairSystem_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
{
WM_main_add_notifier(NC_OBJECT|ND_DRAW, ptr->id.data);
}
+#endif
#else
@@ -99,12 +101,6 @@ static void rna_def_hair_system(BlenderRNA *brna)
srna = RNA_def_struct(brna, "HairSystem", NULL);
RNA_def_struct_ui_text(srna, "Hair System", "Hair simulation and rendering");
- prop = RNA_def_property(srna, "smooth", PROP_FLOAT, PROP_UNSIGNED);
- RNA_def_property_float_sdna(prop, NULL, "smooth");
- RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 2);
- RNA_def_property_ui_text(prop, "Smoothing", "Amount of smoothing");
- RNA_def_property_update(prop, 0, "rna_HairSystem_update");
-
prop = RNA_def_property(srna, "params", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "params");
RNA_def_property_struct_type(prop, "HairParams");
More information about the Bf-blender-cvs
mailing list