[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10847] branches/soc-2007-maike/source/ blender/src/header_view3d.c: Reconstruct GLSL material list on layer change , keeping the ones still visible, deleting the others and creating the ones now visible

[Miguel Torres Lima]

Revision: 10847
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10847
Author:   maike
Date:     2007-06-01 18:50:41 +0200 (Fri, 01 Jun 2007)

Log Message:
-----------
Reconstruct GLSL material list on layer change, keeping the ones still visible, deleting the others and creating the ones now visible

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

Modified: branches/soc-2007-maike/source/blender/src/header_view3d.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/header_view3d.c	2007-06-01 16:48:42 UTC (rev 10846)
+++ branches/soc-2007-maike/source/blender/src/header_view3d.c	2007-06-01 16:50:41 UTC (rev 10847)
@@ -117,6 +117,7 @@
 #include "BIF_toets.h"
 #include "BIF_toolbox.h"
 #include "BIF_transform.h"
+#include "BIF_glsl_material.h"
 
 #ifdef WITH_VERSE
 #include "BIF_verse.h"
@@ -4662,6 +4663,7 @@
 	case B_SCENELOCK:
 		if(G.vd->scenelock) {
 			G.vd->lay= G.scene->lay;
+
 			/* seek for layact */
 			bit= 0;
 			while(bit<32) {
@@ -4883,6 +4885,7 @@
 	default:
 
 		if(event>=B_LAY && event<B_LAY+31) {
+
 			if(G.vd->lay!=0 && (G.qual & LR_SHIFTKEY)) {
 				
 				/* but do find active layer */
@@ -4908,6 +4911,8 @@
 				G.vd->layact= G.vd->lay;
 				scrarea_queue_headredraw(curarea);
 			}
+			            		
+			if(G.scene->lay != G.vd->lay) glsl_do_layer_change(G.vd->lay);
 			
 			if(G.vd->scenelock) handle_view3d_lock();