blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

UI: Updated Auto Keying Button Icon #105574

Merged
Harley Acheson merged 1 commits from Harley/blender:RecordRed into main 2024-01-08 23:17:05 +01:00
Conversation 42 Commits 1 Files Changed 8 +48 -5
8 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
release/datafiles/blender_icons.svg
View File

@ -46,8 +46,8 @@
id="namedview34335"
showgrid="false"
inkscape:zoom="1.4142136"
inkscape:cx="229.45615"
inkscape:cy="319.96582"
inkscape:cx="268.34702"
inkscape:cy="242.89117"
inkscape:window-x="1912"
inkscape:window-y="-8"
inkscape:window-maximized="1"
@ -19237,6 +19237,47 @@
fill="#ffffff"
id="path5-2" />
</g>
<g
transform="translate(189.03819,-63.105705)"
id="g37415-7"
inkscape:label="DA-14"
style="display:inline;enable-background:new">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
d="m 286,622 c -2.7555,0 -5,2.2445 -5,5 0,2.7555 2.2445,5 5,5 2.7555,0 5,-2.2445 5,-5 0,-2.7555 -2.2445,-5 -5,-5 z"
id="circle13982-8"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssss" />
<rect
style="display:inline;fill:none;stroke-width:1.627;enable-background:new"
id="rect37443-8-9"
width="18"
height="18"
x="276.99994"
y="-636"
transform="scale(1,-1)"
inkscape:label="frame" />
</g>
<g
transform="translate(189.03819,-63.105705)"
id="g37418-6"
inkscape:label="DA-13"
style="display:inline;enable-background:new">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.6;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
d="m 265,622 c -2.7555,0 -5,2.2445 -5,5 0,2.7555 2.2445,5 5,5 2.7555,0 5,-2.2445 5,-5 0,-2.7555 -2.2445,-5 -5,-5 z m 0,1 c 2.21506,0 4,1.78494 4,4 0,2.21506 -1.78494,4 -4,4 -2.21506,0 -4,-1.78494 -4,-4 0,-2.21506 1.78494,-4 4,-4 z"
id="path13966-3"
inkscape:connector-curvature="0" />
<rect
style="display:inline;fill:none;stroke-width:1.627;enable-background:new"
id="rect21004-5-8-0-9-3"
width="18"
height="18"
x="255.99994"
y="-636"
transform="scale(1,-1)"
inkscape:label="frame" />
</g>
</g>
<g
inkscape:groupmode="layer"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

BIN
release/datafiles/blender_icons16/icon16_record_off.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons16/icon16_record_on.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_record_off.dat Normal file
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_record_on.dat Normal file
View File

Binary file not shown.

2
source/blender/editors/datafiles/CMakeLists.txt
View File

@ -110,6 +110,8 @@ set(ICON_NAMES
speaker
tool_settings
shaderfx
record_off
record_on
fake_user_off
fake_user_on
view3d

4
source/blender/editors/include/UI_icons.hh
View File

@ -143,8 +143,8 @@ DEF_ICON_BLANK(155)
DEF_ICON_BLANK(156)
DEF_ICON_BLANK(157)
DEF_ICON_BLANK(158)
DEF_ICON_BLANK(159)
DEF_ICON_BLANK(160)
DEF_ICON(RECORD_OFF)
DEF_ICON(RECORD_ON)
DEF_ICON(BLANK1) /* Not actually blank - this is used all over the place */
DEF_ICON(FAKE_USER_OFF)
DEF_ICON(FAKE_USER_ON)

2
source/blender/makesrna/intern/rna_scene.cc
View File

@ -3813,7 +3813,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, nullptr, "autokey_mode", AUTOKEY_ON);
RNA_def_property_ui_text(
prop, "Auto Keying", "Automatic keyframe insertion for Objects, Bones and Masks");
RNA_def_property_ui_icon(prop, ICON_REC, 0);
RNA_def_property_ui_icon(prop, ICON_RECORD_OFF, 1);
prop = RNA_def_property(srna, "auto_keying_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, nullptr, "autokey_mode");