Fix UI error - some curve settings were in the path panel and were greyed out when...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 28 Feb 2012 11:18:05 +0000 (11:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 28 Feb 2012 11:18:05 +0000 (11:18 +0000)
noticed while looking into bug [#30349].

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

release/scripts/startup/bl_ui/properties_data_curve.py
source/blender/makesrna/intern/rna_curve.c

index 91230c9dc899c72cc39b54a936028594da22019f..fb365ea1fa4cee31bdf4a956de1b6b24503b9340 100644 (file)
@@ -113,6 +113,14 @@ class DATA_PT_shape_curve(CurveButtonsPanel, Panel):
             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"
@@ -189,16 +197,11 @@ class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel):
         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")
 
-        col = split.column()
-        col.prop(curve, "use_radius")
-        col.prop(curve, "use_time_offset", text="Offset Children")
+        # these are for paths only
+        row = layout.row()
+        row.prop(curve, "use_path_follow")
+        row.prop(curve, "use_time_offset", text="Offset Children")
 
 
 class DATA_PT_active_spline(CurveButtonsPanelActive, Panel):
index 088f2dba0bb55bd628d63c3a85f226384c8f1542..91d3c3a0d3f555092766061ecf57b61f01bf8afc 100644 (file)
@@ -849,12 +849,14 @@ static void rna_def_path(BlenderRNA *brna, StructRNA *srna)
        
        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 @@ static void rna_def_path(BlenderRNA *brna, StructRNA *srna)
 
        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");
 }