[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44512] trunk/blender: Fix UI error - some curve settings were in the path panel and were greyed out when 'Path Animation' was disabled, but were infact used for the curve deform modifier.

[Campbell Barton]

Revision: 44512
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44512
Author:   campbellbarton
Date:     2012-02-28 11:18:05 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Fix UI error - some curve settings were in the path panel and were greyed out when 'Path Animation' was disabled, but were infact used for the curve deform modifier.

noticed while looking into bug [#30349].

Move these settings under the main curves panel under text "Path / Curve-Deform:"

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
    trunk/blender/source/blender/makesrna/intern/rna_curve.c

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py	2012-02-28 10:43:37 UTC (rev 44511)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py	2012-02-28 11:18:05 UTC (rev 44512)
@@ -113,7 +113,15 @@
             sub.prop(curve, "fill_mode", text="")
             col.prop(curve, "use_fill_deform")
 
+        if is_curve:
+            col.label(text="Path / Curve-Deform:")
+            sub = col.column()
+            rowsub = sub.row()
+            rowsub.prop(curve, "use_radius")
+            rowsub.prop(curve, "use_stretch")
+            sub.prop(curve, "use_deform_bounds")
 
+
 class DATA_PT_curve_texture_space(CurveButtonsPanel, Panel):
     bl_label = "Texture Space"
     bl_options = {'DEFAULT_CLOSED'}
@@ -189,18 +197,13 @@
         layout.prop(curve, "path_duration", text="Frames")
         layout.prop(curve, "eval_time")
 
-        split = layout.split()
 
-        col = split.column()
-        col.prop(curve, "use_path_follow")
-        col.prop(curve, "use_stretch")
-        col.prop(curve, "use_deform_bounds")
+        # these are for paths only
+        row = layout.row()
+        row.prop(curve, "use_path_follow")
+        row.prop(curve, "use_time_offset", text="Offset Children")
 
-        col = split.column()
-        col.prop(curve, "use_radius")
-        col.prop(curve, "use_time_offset", text="Offset Children")
 
-
 class DATA_PT_active_spline(CurveButtonsPanelActive, Panel):
     bl_label = "Active Spline"
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c	2012-02-28 10:43:37 UTC (rev 44511)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c	2012-02-28 11:18:05 UTC (rev 44512)
@@ -849,12 +849,14 @@
 	
 	prop= RNA_def_property(srna, "use_stretch", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_STRETCH);
-	RNA_def_property_ui_text(prop, "Stretch", "Option for curve-deform: make deformed child to stretch along entire path");
+	RNA_def_property_ui_text(prop, "Stretch", "Option for curve-deform: "
+	                         "make deformed child to stretch along entire path");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
 	prop= RNA_def_property(srna, "use_deform_bounds", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CU_DEFORM_BOUNDS_OFF);
-	RNA_def_property_ui_text(prop, "Bounds Clamp", "Use the mesh bounds to clamp the deformation");
+	RNA_def_property_ui_text(prop, "Bounds Clamp", "Option for curve-deform: "
+	                         "Use the mesh bounds to clamp the deformation");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");	
 
 	prop= RNA_def_property(srna, "use_time_offset", PROP_BOOLEAN, PROP_NONE);
@@ -864,7 +866,8 @@
 
 	prop= RNA_def_property(srna, "use_radius", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_PATH_RADIUS);
-	RNA_def_property_ui_text(prop, "Radius", "Option for paths: apply the curve radius with path following it and deforming");
+	RNA_def_property_ui_text(prop, "Radius", "Option for paths and curve-deform: "
+	                         "apply the curve radius with path following it and deforming");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 }