[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31469] trunk/blender: rna remaining that negates values

Campbell Barton ideasman42 at gmail.com
Fri Aug 20 04:08:46 CEST 2010


Revision: 31469
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31469
Author:   campbellbarton
Date:     2010-08-20 04:08:43 +0200 (Fri, 20 Aug 2010)

Log Message:
-----------
rna remaining that negates values

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/rigify/arm_biped.py
    trunk/blender/release/scripts/modules/rigify/leg_biped.py
    trunk/blender/release/scripts/ui/properties_data_bone.py
    trunk/blender/release/scripts/ui/properties_material.py
    trunk/blender/release/scripts/ui/properties_physics_smoke.py
    trunk/blender/source/blender/makesrna/intern/rna_material.c
    trunk/blender/source/blender/makesrna/intern/rna_pose.c
    trunk/blender/source/blender/makesrna/intern/rna_smoke.c
    trunk/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt

Modified: trunk/blender/release/scripts/modules/rigify/arm_biped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/arm_biped.py	2010-08-19 23:07:43 UTC (rev 31468)
+++ trunk/blender/release/scripts/modules/rigify/arm_biped.py	2010-08-20 02:08:43 UTC (rev 31469)
@@ -147,9 +147,9 @@
     ik_chain.update()
 
     # Set IK dof
-    ik_chain.forearm_p.ik_dof_x = True
-    ik_chain.forearm_p.ik_dof_y = False
-    ik_chain.forearm_p.ik_dof_z = False
+    ik_chain.forearm_p.lock_ik_x = False
+    ik_chain.forearm_p.lock_ik_y = True
+    ik_chain.forearm_p.lock_ik_z = True
 
     con = ik_chain.forearm_p.constraints.new('IK')
     con.target = obj

Modified: trunk/blender/release/scripts/modules/rigify/leg_biped.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/leg_biped.py	2010-08-19 23:07:43 UTC (rev 31468)
+++ trunk/blender/release/scripts/modules/rigify/leg_biped.py	2010-08-20 02:08:43 UTC (rev 31469)
@@ -211,9 +211,9 @@
     ik_chain.update()
 
     # Set IK dof
-    ik_chain.shin_p.ik_dof_x = True
-    ik_chain.shin_p.ik_dof_y = False
-    ik_chain.shin_p.ik_dof_z = False
+    ik_chain.shin_p.lock_ik_x = False
+    ik_chain.shin_p.lock_ik_y = True
+    ik_chain.shin_p.lock_ik_z = True
 
     # Set rotation modes and axis locks
     ik.foot_roll_p.rotation_mode = 'XYZ'

Modified: trunk/blender/release/scripts/ui/properties_data_bone.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_bone.py	2010-08-19 23:07:43 UTC (rev 31468)
+++ trunk/blender/release/scripts/ui/properties_data_bone.py	2010-08-20 02:08:43 UTC (rev 31469)
@@ -224,56 +224,56 @@
         row.prop(ob.pose, "ik_solver")
 
         split = layout.split(percentage=0.25)
-        split.prop(pchan, "ik_dof_x", text="X")
+        split.prop(pchan, "lock_ik_x", text="Lock X")
         split.active = pchan.is_in_ik_chain
         row = split.row()
         row.prop(pchan, "ik_stiffness_x", text="Stiffness", slider=True)
-        row.active = pchan.ik_dof_x and pchan.is_in_ik_chain
+        row.active = pchan.lock_ik_x == False and pchan.is_in_ik_chain
 
         split = layout.split(percentage=0.25)
         sub = split.row()
 
         sub.prop(pchan, "ik_limit_x", text="Limit")
-        sub.active = pchan.ik_dof_x and pchan.is_in_ik_chain
+        sub.active = pchan.lock_ik_x == False and pchan.is_in_ik_chain
         sub = split.row(align=True)
         sub.prop(pchan, "ik_min_x", text="")
         sub.prop(pchan, "ik_max_x", text="")
-        sub.active = pchan.ik_dof_x and pchan.ik_limit_x and pchan.is_in_ik_chain
+        sub.active = pchan.lock_ik_x == False and pchan.ik_limit_x and pchan.is_in_ik_chain
 
         split = layout.split(percentage=0.25)
-        split.prop(pchan, "ik_dof_y", text="Y")
+        split.prop(pchan, "lock_ik_y", text="Y")
         split.active = pchan.is_in_ik_chain and pchan.is_in_ik_chain
         row = split.row()
         row.prop(pchan, "ik_stiffness_y", text="Stiffness", slider=True)
-        row.active = pchan.ik_dof_y and pchan.is_in_ik_chain
+        row.active = pchan.lock_ik_y == False and pchan.is_in_ik_chain
 
         split = layout.split(percentage=0.25)
         sub = split.row()
 
         sub.prop(pchan, "ik_limit_y", text="Limit")
-        sub.active = pchan.ik_dof_y and pchan.is_in_ik_chain
+        sub.active = pchan.lock_ik_y == False and pchan.is_in_ik_chain
 
         sub = split.row(align=True)
         sub.prop(pchan, "ik_min_y", text="")
         sub.prop(pchan, "ik_max_y", text="")
-        sub.active = pchan.ik_dof_y and pchan.ik_limit_y and pchan.is_in_ik_chain
+        sub.active = pchan.lock_ik_y == False and pchan.ik_limit_y and pchan.is_in_ik_chain
 
         split = layout.split(percentage=0.25)
-        split.prop(pchan, "ik_dof_z", text="Z")
+        split.prop(pchan, "lock_ik_z", text="Z")
         split.active = pchan.is_in_ik_chain and pchan.is_in_ik_chain
         sub = split.row()
         sub.prop(pchan, "ik_stiffness_z", text="Stiffness", slider=True)
-        sub.active = pchan.ik_dof_z and pchan.is_in_ik_chain
+        sub.active = pchan.lock_ik_z == False and pchan.is_in_ik_chain
 
         split = layout.split(percentage=0.25)
         sub = split.row()
 
         sub.prop(pchan, "ik_limit_z", text="Limit")
-        sub.active = pchan.ik_dof_z and pchan.is_in_ik_chain
+        sub.active = pchan.lock_ik_z == False and pchan.is_in_ik_chain
         sub = split.row(align=True)
         sub.prop(pchan, "ik_min_z", text="")
         sub.prop(pchan, "ik_max_z", text="")
-        sub.active = pchan.ik_dof_z and pchan.ik_limit_z and pchan.is_in_ik_chain
+        sub.active = pchan.lock_ik_z == False and pchan.ik_limit_z and pchan.is_in_ik_chain
         split = layout.split()
         split.prop(pchan, "ik_stretch", text="Stretch", slider=True)
         split.label()

Modified: trunk/blender/release/scripts/ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_material.py	2010-08-19 23:07:43 UTC (rev 31468)
+++ trunk/blender/release/scripts/ui/properties_material.py	2010-08-20 02:08:43 UTC (rev 31469)
@@ -648,7 +648,7 @@
         col.prop(mat, "traceable")
         col.prop(mat, "full_oversampling")
         col.prop(mat, "use_sky")
-        col.prop(mat, "exclude_mist")
+        col.prop(mat, "use_mist")
         col.prop(mat, "invert_z")
         sub = col.row()
         sub.prop(mat, "z_offset")
@@ -883,7 +883,7 @@
         col = split.column()
         col.prop(mat, "traceable")
         col.prop(mat, "full_oversampling")
-        col.prop(mat, "exclude_mist")
+        col.prop(mat, "use_mist")
 
         col = split.column()
         col.label(text="Light Group:")

Modified: trunk/blender/release/scripts/ui/properties_physics_smoke.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_smoke.py	2010-08-19 23:07:43 UTC (rev 31468)
+++ trunk/blender/release/scripts/ui/properties_physics_smoke.py	2010-08-20 02:08:43 UTC (rev 31469)
@@ -95,7 +95,7 @@
                 split = layout.split()
 
                 col = split.column()
-                col.prop(flow, "outflow")
+                col.prop(flow, "use_outflow")
                 col.label(text="Particle System:")
                 col.prop_object(flow, "psys", ob, "particle_systems", text="")
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_material.c	2010-08-19 23:07:43 UTC (rev 31468)
+++ trunk/blender/source/blender/makesrna/intern/rna_material.c	2010-08-20 02:08:43 UTC (rev 31469)
@@ -620,9 +620,9 @@
 	RNA_def_property_ui_text(prop, "Enabled", "Enable this material texture slot");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 
-	prop= RNA_def_property(srna, "new_bump", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_NEW_BUMP);
-	RNA_def_property_ui_text(prop, "New Bump", "Use new, corrected bump mapping code (backwards compatibility option)");
+	prop= RNA_def_property(srna, "use_old_bump", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "texflag", MTEX_NEW_BUMP);
+	RNA_def_property_ui_text(prop, "Old Bump", "Use old bump mapping (backwards compatibility option)");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 }
 
@@ -1643,9 +1643,9 @@
 	RNA_def_property_ui_text(prop, "Cast Shadows Only", "Makes objects with this material appear invisible, only casting shadows (not rendered)");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 	
-	prop= RNA_def_property(srna, "exclude_mist", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_NOMIST);
-	RNA_def_property_ui_text(prop, "Exclude Mist", "Excludes this material from mist effects (in world settings)");
+	prop= RNA_def_property(srna, "use_mist", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "mode", MA_NOMIST);
+	RNA_def_property_ui_text(prop, "Use Mist", "Use mist with this material (in world settings)");
 	RNA_def_property_update(prop, 0, "rna_Material_update");
 	
 	prop= RNA_def_property(srna, "receive_transparent_shadows", PROP_BOOLEAN, PROP_NONE);

Modified: trunk/blender/source/blender/makesrna/intern/rna_pose.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_pose.c	2010-08-19 23:07:43 UTC (rev 31468)
+++ trunk/blender/source/blender/makesrna/intern/rna_pose.c	2010-08-20 02:08:43 UTC (rev 31469)
@@ -812,21 +812,21 @@
 	RNA_def_property_ui_text(prop, "Has IK", "Is part of an IK chain");
 	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update");
 
-	prop= RNA_def_property(srna, "ik_dof_x", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_XDOF);
-	RNA_def_property_ui_text(prop, "IK X DoF", "Allow movement around the X axis");
+	prop= RNA_def_property(srna, "lock_ik_x", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_NO_XDOF);
+	RNA_def_property_ui_text(prop, "IK X Lock", "Disallow movement around the X axis");
 	RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable");
 	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update");
 
-	prop= RNA_def_property(srna, "ik_dof_y", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_YDOF);
-	RNA_def_property_ui_text(prop, "IK Y DoF", "Allow movement around the Y axis");
+	prop= RNA_def_property(srna, "lock_ik_y", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "ikflag", BONE_IK_NO_YDOF);
+	RNA_def_property_ui_text(prop, "IK Y Lock", "Disallow movement around the Y axis");
 	RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable");
 	RNA_def_property_update(prop, NC_OBJECT|ND_POSE, "rna_Pose_IK_update");
 
-	prop= RNA_def_property(srna, "ik_dof_z", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "ikflag", BONE_IK_NO_ZDOF);

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list