[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49162] branches/soc-2012-bratwurst: Move floating controls option to the Interface tab where it fits better.

[Jorge Rodriguez]

Revision: 49162
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49162
Author:   vino
Date:     2012-07-24 00:29:11 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Move floating controls option to the Interface tab where it fits better.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c

Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_userpref.py	2012-07-23 22:57:53 UTC (rev 49161)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_userpref.py	2012-07-24 00:29:11 UTC (rev 49162)
@@ -183,6 +183,8 @@
         col.separator()
         col.separator()
 
+        col.label(text="3D view floating controls:")
+        col.prop(view, "floating_controls")
         col.prop(view, "show_mini_axis", text="Display Mini Axis")
         sub = col.column()
         sub.active = view.show_mini_axis
@@ -294,8 +296,6 @@
         row.separator()
 
         col = row.column()
-        col.label(text="3D view floating controls:")
-        col.prop(edit, "floating_controls")
         col.label(text="Grease Pencil:")
         col.prop(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance")
         col.prop(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance")

Modified: branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c	2012-07-23 22:57:53 UTC (rev 49161)
+++ branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_userdef.c	2012-07-24 00:29:11 UTC (rev 49162)
@@ -2437,6 +2437,15 @@
 		{0, NULL, 0, NULL, NULL}
 	};
 	
+	static EnumPropertyItem floating_control_modes[] = {
+		{USER_FLOATING_CONTROLS_OFF, "OFF", 0, "Off", ""},
+		{USER_FLOATING_CONTROLS_TOP, "TOP", 0, "Top", ""},
+		{USER_FLOATING_CONTROLS_LEFT, "LEFT", 0, "Left", ""},
+		{USER_FLOATING_CONTROLS_BOTTOM, "BOTTOM", 0, "Bottom", ""},
+		{USER_FLOATING_CONTROLS_RIGHT, "RIGHT", 0, "Right", ""},
+		{0, NULL, 0, NULL, NULL}
+	};
+
 	PropertyRNA *prop;
 	StructRNA *srna;
 	
@@ -2643,6 +2652,11 @@
 	RNA_def_property_ui_text(prop, "TimeCode Style",
 	                         "Format of Time Codes displayed when not displaying timing in terms of frames");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
+
+	prop = RNA_def_property(srna, "floating_controls", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_items(prop, floating_control_modes);
+	RNA_def_property_ui_text(prop, "", "Position of the floating controls in the 3D view");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 }
 
 static void rna_def_userdef_edit(BlenderRNA *brna)
@@ -2669,15 +2683,6 @@
 		{0, NULL, 0, NULL, NULL}
 	};
 
-	static EnumPropertyItem floating_control_modes[] = {
-		{USER_FLOATING_CONTROLS_OFF, "OFF", 0, "Off", ""},
-		{USER_FLOATING_CONTROLS_TOP, "TOP", 0, "Top", ""},
-		{USER_FLOATING_CONTROLS_LEFT, "LEFT", 0, "Left", ""},
-		{USER_FLOATING_CONTROLS_BOTTOM, "BOTTOM", 0, "Bottom", ""},
-		{USER_FLOATING_CONTROLS_RIGHT, "RIGHT", 0, "Right", ""},
-		{0, NULL, 0, NULL, NULL}
-	};
-
 	srna = RNA_def_struct(brna, "UserPreferencesEdit", NULL);
 	RNA_def_struct_sdna(srna, "UserDef");
 	RNA_def_struct_nested(brna, srna, "UserPreferences");
@@ -2868,11 +2873,6 @@
 	prop = RNA_def_property(srna, "use_duplicate_particle", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "dupflag", USER_DUP_PSYS);
 	RNA_def_property_ui_text(prop, "Duplicate Particle", "Causes particle systems to be duplicated with the object");
-
-	prop = RNA_def_property(srna, "floating_controls", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_items(prop, floating_control_modes);
-	RNA_def_property_ui_text(prop, "", "Position of the floating controls in the 3D view");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 }
 
 static void rna_def_userdef_system(BlenderRNA *brna)