griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for errors in constraints and modifiers made when rna renaming.

Browse Source
This commit is contained in:
Campbell Barton
2010-08-21 07:15:11 +00:00
parent 5c3d2b13b8
commit 87eaf57593
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
release/scripts/ui/properties_data_modifier.py
View File

@@ -496,7 +496,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
col = split.column()
if md.mode == 'PROJECT':
if md.wrap_method == 'PROJECT':
col.label(text="Axis:")
col.prop(md, "use_project_x")
col.prop(md, "use_project_y")
@@ -516,7 +516,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
layout.label(text="Auxiliary Target:")
layout.prop(md, "auxiliary_target", text="")
elif md.mode == 'NEAREST_SURFACEPOINT':
elif md.wrap_method == 'NEAREST_SURFACEPOINT':
layout.prop(md, "use_keep_above_surface")
def SIMPLE_DEFORM(self, layout, ob, md):
@@ -543,7 +543,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
col.label(text="Deform:")
col.prop(md, "factor")
col.prop(md, "limits", slider=True)
if md.mode in ('TAPER', 'STRETCH'):
if md.deform_method in ('TAPER', 'STRETCH'):
col.prop(md, "lock_x")
col.prop(md, "lock_y")
@@ -653,7 +653,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
col = split.column()
col.prop(md, "use_normal")
sub = col.column()
sub.active = md.normals
sub.active = md.use_normal
sub.prop(md, "use_normal_x", text="X")
sub.prop(md, "use_normal_y", text="Y")
sub.prop(md, "use_normal_z", text="Z")

4
release/scripts/ui/properties_object_constraint.py
View File

@@ -674,6 +674,10 @@ class ConstraintButtonsPanel():
col = layout.column()
col.prop(con, "rotation_range", text="Pivot When")
def SCRIPT(self, context, layout, con):
layout.label("blender 2.5 has no py-constraints")
class OBJECT_PT_constraints(ConstraintButtonsPanel, bpy.types.Panel):
bl_label = "Object Constraints"
bl_context = "constraint"

6
source/blender/makesrna/intern/rna_modifier.c
View File

@@ -1407,17 +1407,17 @@ static void rna_def_modifier_smooth(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "SmoothModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_SMOOTH);
prop= RNA_def_property(srna, "ise_x", PROP_BOOLEAN, PROP_NONE);
prop= RNA_def_property(srna, "use_x", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_X);
RNA_def_property_ui_text(prop, "X", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "ise_y", PROP_BOOLEAN, PROP_NONE);
prop= RNA_def_property(srna, "use_y", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_Y);
RNA_def_property_ui_text(prop, "Y", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop= RNA_def_property(srna, "ise_z", PROP_BOOLEAN, PROP_NONE);
prop= RNA_def_property(srna, "use_z", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_SMOOTH_Z);
RNA_def_property_ui_text(prop, "Z", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");