[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52744] trunk/blender: R/G/ B icons in node space backgroud channel selector all had same color wheel icon which didnt make much sense .

Campbell Barton ideasman42 at gmail.com
Mon Dec 3 14:01:08 CET 2012


Revision: 52744
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52744
Author:   campbellbarton
Date:     2012-12-03 13:01:07 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
R/G/B icons in node space backgroud channel selector all had same color wheel icon which didnt make much sense.

Modified Paths:
--------------
    trunk/blender/release/datafiles/blender_icons.png
    trunk/blender/source/blender/blenkernel/BKE_icons.h
    trunk/blender/source/blender/editors/include/UI_icons.h
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/release/datafiles/blender_icons.png
===================================================================
(Binary files differ)

Modified: trunk/blender/source/blender/blenkernel/BKE_icons.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_icons.h	2012-12-03 12:21:44 UTC (rev 52743)
+++ trunk/blender/source/blender/blenkernel/BKE_icons.h	2012-12-03 13:01:07 UTC (rev 52744)
@@ -30,9 +30,7 @@
 
 /** \file BKE_icons.h
  *  \ingroup bke
- */
-
-/*
+ *
  * Resizable Icons for Blender
  */
 

Modified: trunk/blender/source/blender/editors/include/UI_icons.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_icons.h	2012-12-03 12:21:44 UTC (rev 52743)
+++ trunk/blender/source/blender/editors/include/UI_icons.h	2012-12-03 13:01:07 UTC (rev 52744)
@@ -97,7 +97,7 @@
 	/* 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(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)

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2012-12-03 12:21:44 UTC (rev 52743)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2012-12-03 13:01:07 UTC (rev 52744)
@@ -2976,10 +2976,9 @@
 		{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}
 	};
 




More information about the Bf-blender-cvs mailing list