[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25712] trunk/blender: dupli faces inherit scale wasnt using the right flag internally.

[Campbell Barton]

Revision: 25712
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25712
Author:   campbellbarton
Date:     2010-01-04 18:27:23 +0100 (Mon, 04 Jan 2010)

Log Message:
-----------
dupli faces inherit scale wasnt using the right flag internally.
renamed...
 dupli_frames_no_speed --> use_dupli_frames_speed
 dupli_verts_rotation --> use_dupli_verts_rotation
 dupli_faces_inherit_scale --> use_dupli_faces_scale

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_object.py
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/release/scripts/ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object.py	2010-01-04 17:03:44 UTC (rev 25711)
+++ trunk/blender/release/scripts/ui/properties_object.py	2010-01-04 17:27:23 UTC (rev 25712)
@@ -242,20 +242,20 @@
             col.prop(ob, "dupli_frames_on", text="On")
             col.prop(ob, "dupli_frames_off", text="Off")
 
-            layout.prop(ob, "dupli_frames_no_speed", text="No Speed")
+            layout.prop(ob, "use_dupli_frames_speed", text="Speed")
 
         elif ob.dupli_type == 'VERTS':
-            layout.prop(ob, "dupli_verts_rotation", text="Rotation")
+            layout.prop(ob, "use_dupli_verts_rotation", text="Rotation")
 
         elif ob.dupli_type == 'FACES':
             split = layout.split()
 
             col = split.column()
-            col.prop(ob, "dupli_faces_scale", text="Scale")
+            col.prop(ob, "use_dupli_faces_scale", text="Scale")
 
             if wide_ui:
                 col = split.column()
-            col.prop(ob, "dupli_faces_inherit_scale", text="Inherit Scale")
+            col.prop(ob, "dupli_faces_scale", text="Inherit Scale")
 
         elif ob.dupli_type == 'GROUP':
             if wide_ui:

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-01-04 17:03:44 UTC (rev 25711)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2010-01-04 17:27:23 UTC (rev 25712)
@@ -1788,18 +1788,18 @@
 	RNA_def_property_ui_text(prop, "Dupli Type", "If not None, object duplication method to use.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_dependency_update");
 
-	prop= RNA_def_property(srna, "dupli_frames_no_speed", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLINOSPEED);
-	RNA_def_property_ui_text(prop, "Dupli Frames No Speed", "Set dupliframes to still, regardless of frame.");
+	prop= RNA_def_property(srna, "use_dupli_frames_speed", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "transflag", OB_DUPLINOSPEED);
+	RNA_def_property_ui_text(prop, "Dupli Frames Speed", "Set dupliframes to use the frame."); // TODO, better descriptio!
 	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_update");
 
-	prop= RNA_def_property(srna, "dupli_verts_rotation", PROP_BOOLEAN, PROP_NONE);
+	prop= RNA_def_property(srna, "use_dupli_verts_rotation", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIROT);
 	RNA_def_property_ui_text(prop, "Dupli Verts Rotation", "Rotate dupli according to vertex normal.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL);
 
-	prop= RNA_def_property(srna, "dupli_faces_inherit_scale", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIROT);
+	prop= RNA_def_property(srna, "use_dupli_faces_scale", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIFACES_SCALE);
 	RNA_def_property_ui_text(prop, "Dupli Faces Inherit Scale", "Scale dupli based on face size.");
 	RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_update");