forked from bartvdbraak/blender
Reshuffling DopeSheet filter icons so that they appear more obviously
related to each other
This commit is contained in:
parent
2b0127a0c5
commit
06ae5e4825
@ -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:
|
||||
|
@ -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]);
|
||||
}
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user