diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 15 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/fmodifier.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_action.c | 1 |
3 files changed, 8 insertions, 12 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index cab58a3aadb..74ae427c5cf 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -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: diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 42554679795..95c0aa60991 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -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]); } diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index f24e0a92f78..815a9c92968 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -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 */ |