[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11593] branches/soc-2007-maike/source/ blender/src: Changed shadeless event, now glsl code is rewritten due to vertex color option and some card limitation on if-based return values

[Miguel Torres Lima]

Revision: 11593
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11593
Author:   maike
Date:     2007-08-14 17:48:04 +0200 (Tue, 14 Aug 2007)

Log Message:
-----------
Changed shadeless event, now glsl code is rewritten due to vertex color option and some card limitation on if-based return values

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/src/butspace.c
    branches/soc-2007-maike/source/blender/src/buttons_shading.c

Modified: branches/soc-2007-maike/source/blender/src/butspace.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/butspace.c	2007-08-14 15:46:26 UTC (rev 11592)
+++ branches/soc-2007-maike/source/blender/src/butspace.c	2007-08-14 15:48:04 UTC (rev 11593)
@@ -556,7 +556,9 @@
          	do_matbuts(event);
 		do_global_buttons(event);
 	}
-
+	else if(event == B_MATREWR){
+	  do_matbuts(event);
+	}
 	else if(event == B_MAT_UNIFS){
 	  do_matbuts(event);
 	}

Modified: branches/soc-2007-maike/source/blender/src/buttons_shading.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/buttons_shading.c	2007-08-14 15:46:26 UTC (rev 11592)
+++ branches/soc-2007-maike/source/blender/src/buttons_shading.c	2007-08-14 15:48:04 UTC (rev 11593)
@@ -3186,6 +3186,12 @@
 	      glsl_update_material(ma, 0);
 	  }
 	  break;
+	case B_MATREWR:
+	  do_matbuts(B_MATPRV);
+	  if(ma){ 
+	    if(glsl_active() != 0)
+	      glsl_update_material(ma, event);
+	  }
 	case B_MAT_MAPTO_UNIFS:
 	  do_matbuts(B_MATPRV);
 	  ob = OBACT;
@@ -3936,7 +3942,7 @@
 			uiDefButBitI(block, TOG, MA_VERTEXCOL, B_MAT_VCOL_LIGHT,	"VCol Light",	8,166,74,20, &(ma->mode), 0, 0, 0, 0, "Adds vertex colors as extra light");
 			uiDefButBitI(block, TOG, MA_VERTEXCOLP, B_MAT_VCOL_PAINT, "VCol Paint",	82,166,74,20, &(ma->mode), 0, 0, 0, 0, "Replaces material's colors with vertex colors");
 			uiDefButBitI(block, TOG, MA_FACETEXTURE, B_MAT_TEXFACE, "TexFace",		156,166,74,20, &(ma->mode), 0, 0, 0, 0, "Sets UV-Editor assigned texture as color and texture info for faces");
-			uiDefButBitI(block, TOG, MA_SHLESS, B_MAT_UNIFS, "Shadeless",	230,166,73,20, &(ma->mode), 0, 0, 0, 0, "Makes material insensitive to light or shadow");
+			uiDefButBitI(block, TOG, MA_SHLESS, B_MATREWR, "Shadeless",	230,166,73,20, &(ma->mode), 0, 0, 0, 0, "Makes material insensitive to light or shadow");
 			
 			uiDefButBitI(block, TOG, MA_NOMIST, B_NOP,	"No Mist",		8,146,74,20, &(ma->mode), 0, 0, 0, 0, "Sets the material to ignore mist values");
 			uiDefButBitI(block, TOG, MA_ENV, B_MATPRV,	"Env",			82,146,74,20, &(ma->mode), 0, 0, 0, 0, "Causes faces to render with alpha zero: allows sky/backdrop to show through (only for solid faces)");