[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11883] branches/soc-2007-maike/source/ blender/src/buttons_shading.c: Changed glsl execution to after the events prior "tasks"

[Miguel Torres Lima]

Revision: 11883
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11883
Author:   maike
Date:     2007-08-29 18:39:46 +0200 (Wed, 29 Aug 2007)

Log Message:
-----------
Changed glsl execution to after the events prior "tasks"

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

Modified: branches/soc-2007-maike/source/blender/src/buttons_shading.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/buttons_shading.c	2007-08-29 14:20:56 UTC (rev 11882)
+++ branches/soc-2007-maike/source/blender/src/buttons_shading.c	2007-08-29 16:39:46 UTC (rev 11883)
@@ -3118,11 +3118,12 @@
 		  
 		  if(ma) {
 		    end_render_material(ma);	// temporal... 3d preview
-		    if(glsl_active()) glsl_colorbands_change(ma);
 		  }
 		  allqueue(REDRAWBUTSSHADING, 0);
 		  BIF_preview_changed(ID_MA);
 		  shade_buttons_change_3d();
+
+		  if(ma && glsl_active()) glsl_colorbands_change(ma);
 		}
 		break;
 	case B_MAT_USENODES:
@@ -3161,20 +3162,20 @@
 		}
 		break;
 	case B_MAT_CB_REWR:
+	  do_matbuts(B_MATPRV);
 	  if(ma){
 	    if(glsl_active())
 	      glsl_update_material(ma, event);
 	  }
-	  do_matbuts(B_MATPRV);
 	  break;
 	case B_MAT_CB_REDR:
+	  do_matbuts(B_MATPRV);
 	  if(ma){
 	    if(glsl_active()){
 	      glsl_colorband_create_tex(ma);
 	      glsl_update_mat_colorband_uniforms(ma);
 	    }
 	  }
-	  do_matbuts(B_MATPRV);
 	  break;
 	case B_MAT_CB_UNIFS:
 	  do_matbuts(B_MATPRV);
@@ -3191,11 +3192,11 @@
 	  }
 	  break;
 	case B_MATREWR:	  
+	  do_matbuts(B_MATPRV);
 	  if(ma){ 
-	    if(glsl_active() != 0)
+	    if(glsl_active())
 	      glsl_update_material(ma, event);
 	  }
-	  do_matbuts(B_MATPRV);
 	case B_MAT_MAPTO_UNIFS:
 	  do_matbuts(B_MATPRV);
 	  ob = OBACT;