Reshuffling DopeSheet filter icons so that they appear more obviously
authorJoshua Leung <aligorith@gmail.com>
Mon, 22 Aug 2011 02:14:39 +0000 (02:14 +0000)
committerJoshua Leung <aligorith@gmail.com>
Mon, 22 Aug 2011 02:14:39 +0000 (02:14 +0000)
related to each other

release/scripts/startup/bl_ui/space_dopesheet.py
source/blender/blenkernel/intern/fmodifier.c
source/blender/makesrna/intern/rna_action.c

index cab58a3aadb8b9444f43a7eb3a51b17eb8fbf9ee..74ae427c5cf34cae099186f3bbe640a7f79c7688 100644 (file)
@@ -35,7 +35,7 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False):
     row.prop(dopesheet, "show_hidden", text="")
 
     if is_nla:
-            row.prop(dopesheet, "show_missing_nla", text="")
+        row.prop(dopesheet, "show_missing_nla", text="")
     
     if not genericFiltersOnly:
         if bpy.data.groups:
@@ -50,21 +50,16 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False):
         if dopesheet.show_only_matching_fcurves:
             row.prop(dopesheet, "filter_fcurve_name", text="")
 
-    row = layout.row()
-    row.prop(dopesheet, "show_datablock_filters", text="Filters", icon='DISCLOSURE_TRI_RIGHT')
+    row = layout.row(align=True)
+    row.prop(dopesheet, "show_datablock_filters", text="Filters")
 
     if (not genericFiltersOnly) and (dopesheet.show_datablock_filters):
-        # TODO: put a box around these?
-        subrow = row.row()
-        
-        row = subrow.row(align=True)
-        row.prop(dopesheet, "show_transforms", text="")
-
-        row = subrow.row(align=True)
         row.prop(dopesheet, "show_scenes", text="")
         row.prop(dopesheet, "show_worlds", text="")
         row.prop(dopesheet, "show_nodes", text="")
 
+        row.prop(dopesheet, "show_transforms", text="")
+
         if bpy.data.meshes:
             row.prop(dopesheet, "show_meshes", text="")
         if bpy.data.shape_keys:
index 425546797950d13c8558716664d03bc697918efc..95c0aa609919951c8ba137472fd18ece5734bb6c 100644 (file)
@@ -629,11 +629,11 @@ static float fcm_cycles_time (FCurve *fcu, FModifier *fcm, float UNUSED(cvalue),
                                cycyofs = (float)ceil((evaltime - ofs) / cycdx);
                        cycyofs *= cycdy;
                }
-
+               
                /* special case for cycle start/end */
                if(cyct == 0.0f) {
                        evaltime = (side == 1 ? lastkey[0] : prevkey[0]);
-
+                       
                        if((mode == FCM_EXTRAPOLATE_MIRROR) && ((int)cycle % 2))
                                evaltime = (side == 1 ? prevkey[0] : lastkey[0]);
                }
index f24e0a92f78becde8026c3256b5c93ac4d5ff1a5..815a9c9296899bf018678597da8b427ae8714dec 100644 (file)
@@ -265,6 +265,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        prop= RNA_def_property(srna, "show_datablock_filters", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_SHOW_DBFILTERS);
        RNA_def_property_ui_text(prop, "Show Datablock Filters", "Show options for whether channels related to certain types of data are included");
+       RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, -1);
        RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN, NULL);
        
        /* General Filtering Settings */