sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

R/G/B icons in node space backgroud channel selector all had same color wheel icon which didnt make much sense.

Browse Source
This commit is contained in:
Campbell Barton 2012-12-03 13:01:07 +00:00
parent 41f98978e3
commit 4f3fdb8d5a
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
release/datafiles/blender_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 224 KiB

After

Width:  |  Height:  |  Size: 185 KiB

4
source/blender/blenkernel/BKE_icons.h
View File

@ -30,9 +30,7 @@
/** \file BKE_icons.h
* \ingroup bke
*/
/*
*
* Resizable Icons for Blender
*/

10
source/blender/editors/include/UI_icons.h
View File

@ -97,7 +97,7 @@ DEF_ICON(PLUGIN)
/* various ui */
DEF_ICON(HELP)
DEF_ICON(GHOST_ENABLED)
DEF_ICON(COLOR)
DEF_ICON(COLOR) /* see COLOR_RED/GREEN/BLUE */
DEF_ICON(LINKED)
DEF_ICON(UNLINKED)
DEF_ICON(HAND)
@ -428,9 +428,11 @@ DEF_ICON(CURVE_PATH)
DEF_ICON(BLANK646)
DEF_ICON(BLANK647)
DEF_ICON(BLANK648)
DEF_ICON(BLANK649)
DEF_ICON(BLANK650)
DEF_ICON(BLANK651)
#endif
DEF_ICON(COLOR_RED)
DEF_ICON(COLOR_GREEN)
DEF_ICON(COLOR_BLUE)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK652)
DEF_ICON(BLANK653)
DEF_ICON(BLANK654)

7
source/blender/makesrna/intern/rna_space.c
View File

@ -2976,10 +2976,9 @@ static void rna_def_space_node(BlenderRNA *brna)
{SNODE_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, "Color and Alpha",
"Draw image with RGB colors and alpha transparency"},
{SNODE_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Draw alpha transparency channel"},
/* XXX, we could use better icons here */
{SNODE_SHOW_R, "RED", ICON_COLOR, "Red", ""},
{SNODE_SHOW_G, "GREEN", ICON_COLOR, "Green", ""},
{SNODE_SHOW_B, "BLUE", ICON_COLOR, "Blue", ""},
{SNODE_SHOW_R, "RED", ICON_COLOR_RED, "Red", ""},
{SNODE_SHOW_G, "GREEN", ICON_COLOR_GREEN, "Green", ""},
{SNODE_SHOW_B, "BLUE", ICON_COLOR_BLUE, "Blue", ""},
{0, NULL, 0, NULL, NULL}
};