[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35469] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: fix [#26448] Solidify Modifier makes mesh texture missing in OpenGL render

Campbell Barton ideasman42 at gmail.com
Fri Mar 11 06:23:57 CET 2011


Revision: 35469
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35469
Author:   campbellbarton
Date:     2011-03-11 05:23:56 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
fix [#26448] Solidify Modifier makes mesh texture missing in OpenGL render

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2011-03-11 03:27:38 UTC (rev 35468)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2011-03-11 05:23:56 UTC (rev 35469)
@@ -183,6 +183,7 @@
 	wmWindowManager *wm= CTX_wm_manager(C);
 	wmNotifier *note, *next;
 	wmWindow *win;
+	unsigned int win_combine_v3d_datamask= 0;
 	
 	if(wm==NULL)
 		return;
@@ -288,6 +289,11 @@
 		MEM_freeN(note);
 	}
 	
+	/* combine datamasks so 1 win doesn't disable UV's in another [#26448] */
+	for(win= wm->windows.first; win; win= win->next) {
+		win_combine_v3d_datamask |= ED_viewedit_datamask(win->screen);
+	}
+
 	/* cached: editor refresh callbacks now, they get context */
 	for(win= wm->windows.first; win; win= win->next) {
 		ScrArea *sa;
@@ -305,7 +311,7 @@
 			/* depsgraph & animation: update tagged datablocks */
 
 			/* copied to set's in scene_update_tagged_recursive() */
-			win->screen->scene->customdata_mask= ED_viewedit_datamask(win->screen);
+			win->screen->scene->customdata_mask= win_combine_v3d_datamask;
 
 			scene_update_tagged(CTX_data_main(C), win->screen->scene);
 		}




More information about the Bf-blender-cvs mailing list