[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31495] trunk/blender: fix for errors in constraints and modifiers made when rna renaming.

[Campbell Barton]

Revision: 31495
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31495
Author:   campbellbarton
Date:     2010-08-21 09:15:11 +0200 (Sat, 21 Aug 2010)

Log Message:
-----------
fix for errors in constraints and modifiers made when rna renaming.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_modifier.py
    trunk/blender/release/scripts/ui/properties_object_constraint.py
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c

Modified: trunk/blender/release/scripts/ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_modifier.py	2010-08-21 06:40:46 UTC (rev 31494)
+++ trunk/blender/release/scripts/ui/properties_data_modifier.py	2010-08-21 07:15:11 UTC (rev 31495)
@@ -496,7 +496,7 @@
 
         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 @@
             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 @@
         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 @@
         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")

Modified: trunk/blender/release/scripts/ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object_constraint.py	2010-08-21 06:40:46 UTC (rev 31494)
+++ trunk/blender/release/scripts/ui/properties_object_constraint.py	2010-08-21 07:15:11 UTC (rev 31495)
@@ -674,6 +674,10 @@
         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"

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2010-08-21 06:40:46 UTC (rev 31494)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2010-08-21 07:15:11 UTC (rev 31495)
@@ -1407,17 +1407,17 @@
 	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");