Icon for LineStyle
authorCampbell Barton <ideasman42@gmail.com>
Mon, 3 Mar 2014 16:47:58 +0000 (03:47 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 3 Mar 2014 17:22:32 +0000 (04:22 +1100)
patch T37008 from Michael P.

release/datafiles/blender_icons.svg
release/datafiles/blender_icons16/icon16_line_data.dat [new file with mode: 0644]
release/datafiles/blender_icons32/icon32_line_data.dat [new file with mode: 0644]
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/include/UI_icons.h
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_linestyle.c

index 8d6b9eef29de62f51e7ae5087c95b2d23b439f89..5b0f4d1e7da53478d6b6d1cd5ffba6521201ce49 100644 (file)
          offset="1"
          style="stop-color:#f9fbff;stop-opacity:1" />
     </linearGradient>
          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"
   </defs>
   <sodipodi:namedview
      id="base"
              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" />
              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"
         </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 (file)
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 (file)
index 0000000..a332508
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_line_data.dat differ
index 4b807059e4ab9a782cbd90233ef90524de9c1987..00a9ff2defbdc493a083db7bb8f9fdbe9165213a 100644 (file)
@@ -2034,7 +2034,7 @@ static bAnimChannelType ACF_DSNTREE =
 /* TODO: just get this from RNA? */
 static int acf_dslinestyle_icon(bAnimListElem *UNUSED(ale))
 {
 /* 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  */
 }
 
 /* get the appropriate flag(s) for the setting when it is valid  */
index dcc526b81d2aa217bcad95ef7dbaedbc77035d4d..4e15f3ee8813edccac55aa45ef3825d38c9c75e1 100644 (file)
@@ -258,8 +258,8 @@ DEF_ICON(BOIDS)
 DEF_ICON(STRANDS)
 DEF_ICON(LIBRARY_DATA_INDIRECT)
 DEF_ICON(GREASEPENCIL)
 DEF_ICON(STRANDS)
 DEF_ICON(LIBRARY_DATA_INDIRECT)
 DEF_ICON(GREASEPENCIL)
+DEF_ICON(LINE_DATA)
 #ifndef DEF_ICON_BLANK_SKIP
 #ifndef DEF_ICON_BLANK_SKIP
-       DEF_ICON(BLANK083)
        DEF_ICON(BLANK084)
 #endif
 DEF_ICON(GROUP_BONE)
        DEF_ICON(BLANK084)
 #endif
 DEF_ICON(GROUP_BONE)
index 763f06bef2152fb17ace5eac3c696fa2fdd65698..d44a3e60a3f1c00a7753be2f1490607e1ab7cc28 100644 (file)
@@ -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:
                        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;
                }
        }
 }
                }
        }
 }
index a36bd8e27c227626925740bf3e76d7172fb90895..c5af85a45faa183a7420eb2df87980a432a01ef7 100644 (file)
@@ -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_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", ""},
        {ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattice", ""},
        {ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Material", ""},
        {ID_MB, "META", ICON_META_DATA, "MetaBall", ""},
index 9146677eb5e35f01c5713c426e984fc665eb2907..0f39846aa973990938b0c6256d5c0579b80276ad 100644 (file)
@@ -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");
        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);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
        prop = RNA_def_property(srna, "show_textures", PROP_BOOLEAN, PROP_NONE);
index e03a3352bac9a38a82c4e100562f988bb3eb466d..81387bdd1c36a38b666486de73d56ba9cd485dc2 100644 (file)
@@ -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");
 
        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");
 
        prop = RNA_def_property(srna, "panel", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_bitflag_sdna(prop, NULL, "panel");