[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39599] branches/soc-2011-pepper: Reshuffling DopeSheet filter icons so that they appear more obviously
Joshua Leung
aligorith at gmail.com
Mon Aug 22 04:14:45 CEST 2011
Revision: 39599
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39599
Author: aligorith
Date: 2011-08-22 02:14:39 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
Reshuffling DopeSheet filter icons so that they appear more obviously
related to each other
Modified Paths:
--------------
branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-pepper/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-pepper/source/blender/makesrna/intern/rna_action.c
Modified: branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_dopesheet.py
===================================================================
--- branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_dopesheet.py 2011-08-22 02:01:22 UTC (rev 39598)
+++ branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_dopesheet.py 2011-08-22 02:14:39 UTC (rev 39599)
@@ -35,7 +35,7 @@
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 @@
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:
Modified: branches/soc-2011-pepper/source/blender/blenkernel/intern/fmodifier.c
===================================================================
--- branches/soc-2011-pepper/source/blender/blenkernel/intern/fmodifier.c 2011-08-22 02:01:22 UTC (rev 39598)
+++ branches/soc-2011-pepper/source/blender/blenkernel/intern/fmodifier.c 2011-08-22 02:14:39 UTC (rev 39599)
@@ -629,11 +629,11 @@
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]);
}
Modified: branches/soc-2011-pepper/source/blender/makesrna/intern/rna_action.c
===================================================================
--- branches/soc-2011-pepper/source/blender/makesrna/intern/rna_action.c 2011-08-22 02:01:22 UTC (rev 39598)
+++ branches/soc-2011-pepper/source/blender/makesrna/intern/rna_action.c 2011-08-22 02:14:39 UTC (rev 39599)
@@ -265,6 +265,7 @@
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 */
More information about the Bf-blender-cvs
mailing list