Commit: 46682d88128074a4589f882fd1296b6c12c75cf6
Author: Campbell Barton
Date: Tue Mar 4 03:47:58 2014 +1100
https://developer.blender.org/rB46682d88128074a4589f882fd1296b6c12c75cf6
Icon for LineStyle
patch T37008 from Michael P.
===================================================================
M release/datafiles/blender_icons.svg
A release/datafiles/blender_icons16/icon16_line_data.dat
A release/datafiles/blender_icons32/icon32_line_data.dat
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/include/UI_icons.h
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_linestyle.c
===================================================================
diff --git a/release/datafiles/blender_icons.svg
b/release/datafiles/blender_icons.svg
index 8d6b9ee..5b0f4d1 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -27207,6 +27207,43 @@
offset="1"
style="stop-color:#f9fbff;stop-opacity:1" />
</linearGradient>
+ <linearGradient
+ gradientTransform="translate(-341.96134,-472.09253)"
+ inkscape:collect="always"
+ xlink:href="#radialGradient16142-4"
+ id="linearGradient16343"
+ x1="349.53067"
+ y1="480.05426"
+ x2="365.46213"
+ y2="461.89044"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ fy="64.567902"
+ fx="20.892099"
+ r="5.257"
+ cy="64.567902"
+ cx="20.892099"
+ id="radialGradient16142-4">
+ <stop
+ id="stop16144-7"
+ style="stop-color:#F0F0F0"
+ offset="0" />
+ <stop
+ id="stop16146-4"
+ style="stop-color:#474747"
+ offset="1" />
+ </radialGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#radialGradient16142-4"
+ id="linearGradient16082"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,-1,550.17094,516.99093)"
+ x1="349.53067"
+ y1="480.05426"
+ x2="365.46213"
+ y2="461.89044" />
</defs>
<sodipodi:namedview
id="base"
@@ -86542,6 +86579,21 @@
id="path27671-4-9-2"
d="m 243.50439,261.92816 -6.46154,-3.3e-4 0,12.12435
6.46154,3.3e-4 m 0,-2.71024 -3.93168,0 0,-6.73444 3.99798,0"
style="fill:url(#linearGradient17037);fill-opacity:1;fill-rule:nonzero;stroke:#0b1728;stroke-width:0.87159598;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
/>
+ <g
+ id="g16055">
+ <path
+
style="fill:none;stroke:#000000;stroke-width:3.0999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.99999996;display:inline;enable-background:new"
+ d="m 205.93257,30.524948 c 0,0 1.9672,4.0072 -0.57023,5.64242
-3.30376,2.12906 -5.70078,-4.03466 -9.17961,-1.16593 -3.02785,2.49685
1.72515,8.34696 1.72515,8.34696"
+ id="path16335"
+ sodipodi:nodetypes="cssc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cssc"
+ id="path15457"
+ d="m 205.93257,30.524948 c 0,0 1.9672,4.0072 -0.57023,5.64242
-3.30376,2.12906 -5.70078,-4.03466 -9.17961,-1.16593 -3.02785,2.49685
1.72515,8.34696 1.72515,8.34696"
+
style="fill:none;stroke:url(#linearGradient16082);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3,
1.5;stroke-dashoffset:0;display:inline;enable-background:new"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
<path
inkscape:connector-curvature="0"
diff --git a/release/datafiles/blender_icons16/icon16_line_data.dat
b/release/datafiles/blender_icons16/icon16_line_data.dat
new file mode 100644
index 0000000..7ac3b44
Binary files /dev/null and
b/release/datafiles/blender_icons16/icon16_line_data.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_line_data.dat
b/release/datafiles/blender_icons32/icon32_line_data.dat
new file mode 100644
index 0000000..a332508
Binary files /dev/null and
b/release/datafiles/blender_icons32/icon32_line_data.dat differ
diff --git a/source/blender/editors/animation/anim_channels_defines.c
b/source/blender/editors/animation/anim_channels_defines.c
index 4b80705..00a9ff2 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -2034,7 +2034,7 @@ static bAnimChannelType ACF_DSNTREE =
/* TODO: just get this from RNA? */
static int acf_dslinestyle_icon(bAnimListElem *UNUSED(ale))
{
- return ICON_BRUSH_DATA; /* FIXME */
+ return ICON_LINE_DATA;
}
/* get the appropriate flag(s) for the setting when it is valid */
diff --git a/source/blender/editors/include/UI_icons.h
b/source/blender/editors/include/UI_icons.h
index dcc526b..4e15f3e 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -258,8 +258,8 @@ DEF_ICON(BOIDS)
DEF_ICON(STRANDS)
DEF_ICON(LIBRARY_DATA_INDIRECT)
DEF_ICON(GREASEPENCIL)
+DEF_ICON(LINE_DATA)
#ifndef DEF_ICON_BLANK_SKIP
- DEF_ICON(BLANK083)
DEF_ICON(BLANK084)
#endif
DEF_ICON(GROUP_BONE)
diff --git a/source/blender/editors/space_outliner/outliner_draw.c
b/source/blender/editors/space_outliner/outliner_draw.c
index 763f06b..d44a3e6 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1122,7 +1122,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax,
float x, float y, TreeSto
case ID_LI:
tselem_draw_icon_uibut(&arg,
ICON_LIBRARY_DATA_DIRECT); break;
case ID_LS:
- tselem_draw_icon_uibut(&arg, ICON_BRUSH_DATA);
break; /* FIXME proper icon */
+ tselem_draw_icon_uibut(&arg, ICON_LINE_DATA);
break;
}
}
}
diff --git a/source/blender/makesrna/intern/rna_ID.c
b/source/blender/makesrna/intern/rna_ID.c
index a36bd8e..c5af85a 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -58,7 +58,7 @@ EnumPropertyItem id_type_items[] = {
{ID_KE, "KEY", ICON_SHAPEKEY_DATA, "Key", ""},
{ID_LA, "LAMP", ICON_LAMP_DATA, "Lamp", ""},
{ID_LI, "LIBRARY", ICON_LIBRARY_DATA_DIRECT, "Library", ""},
- {ID_LS, "LINESTYLE", ICON_BRUSH_DATA, "Line Style", ""}, /* FIXME
proper icon */
+ {ID_LS, "LINESTYLE", ICON_LINE_DATA, "Line Style", ""},
{ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattice", ""},
{ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Material", ""},
{ID_MB, "META", ICON_META_DATA, "MetaBall", ""},
diff --git a/source/blender/makesrna/intern/rna_action.c
b/source/blender/makesrna/intern/rna_action.c
index 9146677..0f39846 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -406,7 +406,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_linestyles", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag",
ADS_FILTER_NOLINESTYLE);
RNA_def_property_ui_text(prop, "Display Line Style", "Include
visualization of Line Style related Animation data");
- RNA_def_property_ui_icon(prop, ICON_BRUSH_DATA, 0); /* FIXME */
+ RNA_def_property_ui_icon(prop, ICON_LINE_DATA, 0);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED,
NULL);
prop = RNA_def_property(srna, "show_textures", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_linestyle.c
b/source/blender/makesrna/intern/rna_linestyle.c
index e03a335..81387bd 100644
--- a/source/blender/makesrna/intern/rna_linestyle.c
+++ b/source/blender/makesrna/intern/rna_linestyle.c
@@ -918,7 +918,7 @@ static void rna_def_linestyle(BlenderRNA *brna)
srna = RNA_def_struct(brna, "FreestyleLineStyle", "ID");
RNA_def_struct_ui_text(srna, "Freestyle Line Style", "Freestyle line
style, reusable by multiple line sets");
- RNA_def_struct_ui_icon(srna, ICON_BRUSH_DATA); /* FIXME: use a proper
icon */
+ RNA_def_struct_ui_icon(srna, ICON_LINE_DATA);
prop = RNA_def_property(srna, "panel", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "panel");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
