From 351eb4fad148acf86df9e2abafd28bcad5ef9e00 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Thu, 9 Feb 2017 18:59:51 +1300 Subject: [PATCH] More tweaks to Normalisation options in Graph Editor * Added a new dedicated icon for normalize * Only use an icon for "Auto" --- release/datafiles/blender_icons.svg | 88 ++++++++++++++++-- .../icon16_normalize_fcurves.dat | Bin 0 -> 1048 bytes .../icon32_normalize_fcurves.dat | Bin 0 -> 4120 bytes release/scripts/startup/bl_ui/space_graph.py | 4 +- source/blender/editors/include/UI_icons.h | 2 +- 5 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 release/datafiles/blender_icons16/icon16_normalize_fcurves.dat create mode 100644 release/datafiles/blender_icons32/icon32_normalize_fcurves.dat diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index e9c114ba1bd..d88788fa904 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -14,7 +14,7 @@ height="640" id="svg2" sodipodi:version="0.32" - inkscape:version="0.91 r" + inkscape:version="0.91 r13725" version="1.0" sodipodi:docname="blender_icons.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" @@ -31338,6 +31338,26 @@ d="m 125.5,433.5 23,0 0,41 -33,0 0,-31 10,-10 z" style="display:inline;fill:url(#linearGradient13110);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none" /> + + + + + + + + + + + + + + +iiv@t0f>RXT2N4Mr+|RKK7M|FFb0Y>gJn>OW|%yP=Huhr z3DOJ1Yk&Uy`TxzEH~(L~diDS1%a{LwVw+I4f_a;6-@g6-=FOY`uV26Z|Ni~^Aa!d& zYJdO!4Prk9;#E*w4y3_AMMZ^OQc}``mzQ@jBO~KFpdd)i(}xcq!tB}f=g%J)8=?tH z%E-t_+jtt?s+^bjziNKce;ZGeJ4#AQ{6OhVj~_pV>Dl!8^Jf?vMZbls@&0+2>i(~| z-vY+-FV+6n&{fU>=?D1*L<2F%tspnS-3(+iNJ~qHmCnuhKj%`@f1h~APZ@0?U^84o zEHAOMvv*_D1JVZr7H$@o+IH6bFPWYGUrI{KFF4cX6UZI?dkX)%N7yWasl!GC{jC~Q z81}zmQ{{ix2uD!3GH4m9Pwd-W2zEngw%clK`e0%TDk^mq%ZmTktSVD#Sf+y8|@YEa&N-ny8j7vVIa4wV^f19)(lE}92^|8odV2nxQ1BYZCac2 zf8Lem|K=`6*O1g9Gr?&QC;&>QoBjg$I9SwRX#f&WVai#CM5Qzj~_q6;t#Gr zrp)JmT656<=u+>u8am1)Nb1pITA~dPv5@7p zP;F{OqqVk%HcB5hCSsxu##XCVE&kx8Cbmd;!=k^+`?}yJ9CfJ9lQ! zobSxsGjq=vG#ZTo#TKH`JdJXB4K~)IESLMSdJ*Nd73AS%^?<*LE7%|gvF;PC+>3R0 zR8$oBlgP+OKpm17#4&-Y0@96$i0~`n;o)TK77DSmwOTDKEG)qM{5;If&B5&KEX>Tz z!1VMqOifL}Itn8rBQQKX3`0XhFgQ2}0|Nul-`@{?eSO?s7V-;7e{pe< z`5@Qp?d^r0o*u5Rdj4HqUC`Ot$)uyB1KQi$p{=dW;{$TZCfQ^BrKKh2gV@h`@>(@t z$qvnv&rkf{!*@EJKt725r?B3wASUedDHtCnolf^AN-IhazWbj-LqjW3QEKBf@%g*J z|Gefeu^LUW+T`m`p50ZY# zP~}HK5Q-8WGP~=WUxG{h^6q8Jwu|m^hm8c}z+;tl#Z+1Nk87SB8qcxL3EE z*T*ltcfHh$EA_+vX#wEcTos2f4&N6N4%@F|V`FU3NczQLzLmjXxJRcG21-umLDS7T zxX}CW+&}57^YSMtWuqJSdlXt>9NH7KA0!;sFSe!qzF@Hj*R;fvmJA=X)xeqG?eNh} zJDhAi42fGdz~;0>FaGYAp8(X)#-aW=6w}f;rDw%BCwx*;(psGm^Vciy=fk@HXFaTPz{izL8s=0U!TS?eXJ(nZF>k=GynM zx!ZC5k9<`D#)Ne)^ec|TsWzLS<03@Yhz<$!?@so>>bH;R5fuvdDa8zEas1YUj+@Nd;FCBstzf?16xK;siCL`rc8&(PT$=AZd!U}Oeo#ujbypXbM3!XD}X#90q@?YOW zbN@34whsr#Qa;JfMT{Yq|6v=D|G9NvDmypm?AVLaaHSZ|b=N`Dt$K`WJ8VkX80^|J z4&|7X8xjY_lYf9%IA7_T%FmMG6FJ1bjkdy3Uu|LEzln(n7#|=1&-^o8Ho$K_&^e

!o+oa7(1mj^3zALhj8C~VtpTk>`Q(wwin`Lxmk;5mWOIM9@q` literal 0 HcmV?d00001 diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index bacbcce2d93..cec3b26f35a 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -43,10 +43,10 @@ class GRAPH_HT_header(Header): dopesheet_filter(layout, context) row = layout.row(align=True) - row.prop(st, "use_normalization", icon='ZOOM_ALL', text="Normalize", toggle=True) + row.prop(st, "use_normalization", icon='NORMALIZE_FCURVES', text="Normalize", toggle=True) sub = row.row(align=True) sub.active = st.use_normalization - sub.prop(st, "use_auto_normalization", text="Auto", toggle=True) + sub.prop(st, "use_auto_normalization", icon='FILE_REFRESH', text="", toggle=True) row = layout.row(align=True) diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 8579778ff79..8420591aa3e 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -653,9 +653,9 @@ DEF_ICON(IPO_BACK) DEF_ICON(IPO_EASE_IN) DEF_ICON(IPO_EASE_OUT) DEF_ICON(IPO_EASE_IN_OUT) +DEF_ICON(NORMALIZE_FCURVES) #ifndef DEF_ICON_BLANK_SKIP /* available */ - DEF_ICON(BLANK203) DEF_ICON(BLANK204) DEF_ICON(BLANK205) DEF_ICON(BLANK206)