[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31440] trunk/blender: rna naming mainly for Scene/IK/KeyingSet's

Campbell Barton ideasman42 at gmail.com
Wed Aug 18 10:58:37 CEST 2010


Revision: 31440
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31440
Author:   campbellbarton
Date:     2010-08-18 10:58:37 +0200 (Wed, 18 Aug 2010)

Log Message:
-----------
rna naming mainly for Scene/IK/KeyingSet's

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_armature.py
    trunk/blender/release/scripts/ui/properties_game.py
    trunk/blender/release/scripts/ui/properties_physics_softbody.py
    trunk/blender/release/scripts/ui/properties_scene.py
    trunk/blender/release/scripts/ui/space_time.py
    trunk/blender/source/blender/makesrna/intern/rna_actuator.c
    trunk/blender/source/blender/makesrna/intern/rna_animation.c
    trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
    trunk/blender/source/blender/makesrna/intern/rna_object_force.c
    trunk/blender/source/blender/makesrna/intern/rna_particle.c
    trunk/blender/source/blender/makesrna/intern/rna_pose.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c
    trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
    trunk/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt

Modified: trunk/blender/release/scripts/ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature.py	2010-08-18 08:26:18 UTC (rev 31439)
+++ trunk/blender/release/scripts/ui/properties_data_armature.py	2010-08-18 08:58:37 UTC (rev 31440)
@@ -206,34 +206,34 @@
             simulation = (itasc.mode == 'SIMULATION')
             if simulation:
                 layout.label(text="Reiteration:")
-                layout.prop(itasc, "reiteration", expand=True)
+                layout.prop(itasc, "reiteration_method", expand=True)
 
             split = layout.split()
-            split.active = not simulation or itasc.reiteration != 'NEVER'
+            split.active = not simulation or itasc.reiteration_method != 'NEVER'
             col = split.column()
             col.prop(itasc, "precision")
 
             col = split.column()
-            col.prop(itasc, "num_iter")
+            col.prop(itasc, "iterations")
 
 
             if simulation:
-                layout.prop(itasc, "auto_step")
+                layout.prop(itasc, "use_auto_step")
                 row = layout.row()
-                if itasc.auto_step:
-                    row.prop(itasc, "min_step", text="Min")
-                    row.prop(itasc, "max_step", text="Max")
+                if itasc.use_auto_step:
+                    row.prop(itasc, "step_min", text="Min")
+                    row.prop(itasc, "step_max", text="Max")
                 else:
-                    row.prop(itasc, "num_step")
+                    row.prop(itasc, "step_count")
 
             layout.prop(itasc, "solver")
             if simulation:
                 layout.prop(itasc, "feedback")
-                layout.prop(itasc, "max_velocity")
+                layout.prop(itasc, "velocity_max")
             if itasc.solver == 'DLS':
                 row = layout.row()
-                row.prop(itasc, "dampmax", text="Damp", slider=True)
-                row.prop(itasc, "dampeps", text="Eps", slider=True)
+                row.prop(itasc, "damping_max", text="Damp", slider=True)
+                row.prop(itasc, "damping_epsilon", text="Eps", slider=True)
 
 from properties_animviz import MotionPathButtonsPanel, OnionSkinButtonsPanel
 

Modified: trunk/blender/release/scripts/ui/properties_game.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_game.py	2010-08-18 08:26:18 UTC (rev 31439)
+++ trunk/blender/release/scripts/ui/properties_game.py	2010-08-18 08:58:37 UTC (rev 31440)
@@ -354,10 +354,10 @@
 
         scene = context.scene
 
-        layout.prop(scene, "distance_model")
+        layout.prop(scene, "audio_distance_model")
 
-        layout.prop(scene, "speed_of_sound", text="Speed")
-        layout.prop(scene, "doppler_factor")
+        layout.prop(scene, "audio_doppler_speed", text="Speed")
+        layout.prop(scene, "audio_doppler_factor")
 
 
 class WorldButtonsPanel():

Modified: trunk/blender/release/scripts/ui/properties_physics_softbody.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_softbody.py	2010-08-18 08:26:18 UTC (rev 31439)
+++ trunk/blender/release/scripts/ui/properties_physics_softbody.py	2010-08-18 08:58:37 UTC (rev 31440)
@@ -249,7 +249,7 @@
         col.label(text="Step Size:")
         col.prop(softbody, "minstep")
         col.prop(softbody, "maxstep")
-        col.prop(softbody, "auto_step", text="Auto-Step")
+        col.prop(softbody, "use_auto_step", text="Auto-Step")
 
         col = split.column()
         col.prop(softbody, "error_limit")

Modified: trunk/blender/release/scripts/ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_scene.py	2010-08-18 08:26:18 UTC (rev 31439)
+++ trunk/blender/release/scripts/ui/properties_scene.py	2010-08-18 08:58:37 UTC (rev 31440)
@@ -96,8 +96,8 @@
 
             col = row.column()
             col.label(text="Keyframing Settings:")
-            col.prop(ks, "insertkey_needed", text="Needed")
-            col.prop(ks, "insertkey_visual", text="Visual")
+            col.prop(ks, "use_insertkey_needed", text="Needed")
+            col.prop(ks, "use_insertkey_visual", text="Visual")
             col.prop(ks, "use_insertkey_xyz_to_rgb", text="XYZ to RGB")
 
 
@@ -138,8 +138,8 @@
 
             col = row.column()
             col.label(text="Array Target:")
-            col.prop(ksp, "entire_array")
-            if ksp.entire_array is False:
+            col.prop(ksp, "use_entire_array")
+            if ksp.use_entire_array is False:
                 col.prop(ksp, "array_index")
 
             col = row.column()
@@ -149,8 +149,8 @@
                 col.prop(ksp, "group")
 
             col.label(text="Keyframing Settings:")
-            col.prop(ksp, "insertkey_needed", text="Needed")
-            col.prop(ksp, "insertkey_visual", text="Visual")
+            col.prop(ksp, "use_insertkey_needed", text="Needed")
+            col.prop(ksp, "use_insertkey_visual", text="Visual")
             col.prop(ksp, "use_insertkey_xyz_to_rgb", text="XYZ to RGB")
 
 
@@ -243,8 +243,8 @@
             f.write("ks.is_path_absolute = False\n")
         f.write("\n")
 
-        f.write("ks.insertkey_needed = %s\n" % ks.insertkey_needed)
-        f.write("ks.insertkey_visual = %s\n" % ks.insertkey_visual)
+        f.write("ks.use_insertkey_needed = %s\n" % ks.use_insertkey_needed)
+        f.write("ks.use_insertkey_visual = %s\n" % ks.use_insertkey_visual)
         f.write("ks.use_insertkey_xyz_to_rgb = %s\n" % ks.use_insertkey_xyz_to_rgb)
         f.write("\n")
 
@@ -292,7 +292,7 @@
             f.write("%s, '%s'" % (id_bpy_path, ksp.data_path))
 
             # array index settings (if applicable)
-            if ksp.entire_array:
+            if ksp.use_entire_array:
                 f.write(", index=-1")
             else:
                 f.write(", index=%d" % ksp.array_index)

Modified: trunk/blender/release/scripts/ui/space_time.py
===================================================================
--- trunk/blender/release/scripts/ui/space_time.py	2010-08-18 08:26:18 UTC (rev 31439)
+++ trunk/blender/release/scripts/ui/space_time.py	2010-08-18 08:58:37 UTC (rev 31440)
@@ -46,8 +46,8 @@
             row.prop(scene, "frame_start", text="Start")
             row.prop(scene, "frame_end", text="End")
         else:
-            row.prop(scene, "preview_range_frame_start", text="Start")
-            row.prop(scene, "preview_range_frame_end", text="End")
+            row.prop(scene, "frame_preview_start", text="Start")
+            row.prop(scene, "frame_preview_end", text="End")
 
         layout.prop(scene, "frame_current", text="")
 
@@ -176,10 +176,10 @@
 
         layout.separator()
 
-        layout.prop(scene, "frame_drop", text="Frame Dropping")
-        layout.prop(scene, "sync_audio", text="AV-sync", icon='SPEAKER')
+        layout.prop(scene, "use_frame_drop", text="Frame Dropping")
+        layout.prop(scene, "use_audio_sync", text="AV-sync", icon='SPEAKER')
         layout.prop(scene, "use_audio")
-        layout.prop(scene, "scrub_audio")
+        layout.prop(scene, "use_audio_scrub")
 
 
 class TIME_MT_autokey(bpy.types.Menu):

Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2010-08-18 08:26:18 UTC (rev 31439)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2010-08-18 08:58:37 UTC (rev 31440)
@@ -70,7 +70,7 @@
 		case ACT_OBJECT:
 			return &RNA_ObjectActuator;
 		case ACT_IPO:
-			return &RNA_FcurveActuator;
+			return &RNA_FCurveActuator;
 		case ACT_CAMERA:
 			return &RNA_CameraActuator;
 		case ACT_SOUND:
@@ -771,7 +771,7 @@
 		{ACT_IPO_FROM_PROP, "PROP", 0, "Property", ""},
 		{0, NULL, 0, NULL, NULL}};
 	
-	srna= RNA_def_struct(brna, "FcurveActuator", "Actuator");
+	srna= RNA_def_struct(brna, "FCurveActuator", "Actuator");
 	RNA_def_struct_ui_text(srna, "F-Curve Actuator", "Actuator to animate the object");
 	RNA_def_struct_sdna_from(srna, "bIpoActuator", "data");
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_animation.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animation.c	2010-08-18 08:26:18 UTC (rev 31439)
+++ trunk/blender/source/blender/makesrna/intern/rna_animation.c	2010-08-18 08:58:37 UTC (rev 31440)
@@ -395,12 +395,12 @@
 {
 	PropertyRNA *prop;
 	
-	prop= RNA_def_property(srna, "insertkey_needed", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_insertkey_needed", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "keyingflag", INSERTKEY_NEEDED);
 	RNA_def_property_ui_text(prop, "Insert Keyframes - Only Needed", "Only insert keyframes where they're needed in the relevant F-Curves");
 	if (reg) RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
 	
-	prop= RNA_def_property(srna, "insertkey_visual", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_insertkey_visual", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "keyingflag", INSERTKEY_MATRIX);
 	RNA_def_property_ui_text(prop, "Insert Keyframes - Visual", "Insert keyframes based on 'visual transforms'");
 	if (reg) RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
@@ -519,7 +519,7 @@
 	RNA_def_property_ui_text(prop, "RNA Array Index", "Index to the specific setting if applicable");
 	
 	/* Flags */
-	prop= RNA_def_property(srna, "entire_array", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_entire_array", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", KSP_FLAG_WHOLE_ARRAY);
 	RNA_def_property_ui_text(prop, "Entire Array", "When an 'array/vector' type is chosen (Location, Rotation, Color, etc.), entire array is to be used");
 	

Modified: trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fcurve.c	2010-08-18 08:26:18 UTC (rev 31439)
+++ trunk/blender/source/blender/makesrna/intern/rna_fcurve.c	2010-08-18 08:58:37 UTC (rev 31440)
@@ -1020,7 +1020,7 @@

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list