[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12939] trunk/blender/source/blender/src: Fixed bug #6711, Retopo problem when maximizing 3d view and still painting

[Nicholas Bishop]

Revision: 12939
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12939
Author:   nicholasbishop
Date:     2007-12-18 22:56:17 +0100 (Tue, 18 Dec 2007)

Log Message:
-----------
Fixed bug #6711, Retopo problem when maximizing 3d view and still painting

Caused by some incorrect usage of the current v3d during updates

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawview.c
    trunk/blender/source/blender/src/editscreen.c
    trunk/blender/source/blender/src/retopo.c
    trunk/blender/source/blender/src/toets.c

Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c	2007-12-18 17:29:35 UTC (rev 12938)
+++ trunk/blender/source/blender/src/drawview.c	2007-12-18 21:56:17 UTC (rev 12939)
@@ -3065,6 +3065,8 @@
 				fdrawXORcirc((float)car[0], (float)car[1], sculptmode_brush()->size);
 		}
 	}
+
+	retopo_paint_view_update(v3d);
 	retopo_draw_paint_lines();
 
 	if(!G.obedit && OBACT && G.f&G_PARTICLEEDIT && area_is_active_area(v3d->area)){

Modified: trunk/blender/source/blender/src/editscreen.c
===================================================================
--- trunk/blender/source/blender/src/editscreen.c	2007-12-18 17:29:35 UTC (rev 12938)
+++ trunk/blender/source/blender/src/editscreen.c	2007-12-18 21:56:17 UTC (rev 12939)
@@ -2443,9 +2443,6 @@
 		wich_cursor(newa);
 	}
 	
-	if(curarea->full)
-		retopo_force_update();
-
 	/* there's also events in queue for this, but we call fullscreen for render output
 	now, and that doesn't go back to queue. Bad code, but doesn't hurt... (ton) */
 	for(sa= G.curscreen->areabase.first; sa; sa= sa->next) {
@@ -2455,8 +2452,7 @@
 	/* bad code #2: setscreen() ends with first area active. fullscreen render assumes this too */
 	curarea= sc->areabase.first;
 	
-	if(!curarea->full)
-		retopo_force_update();
+	retopo_force_update();
 }
 
 static void area_autoplayscreen(void)

Modified: trunk/blender/source/blender/src/retopo.c
===================================================================
--- trunk/blender/source/blender/src/retopo.c	2007-12-18 17:29:35 UTC (rev 12938)
+++ trunk/blender/source/blender/src/retopo.c	2007-12-18 21:56:17 UTC (rev 12939)
@@ -452,11 +452,8 @@
 		if(vd) {
 			if(vd->depths) vd->depths->damaged= 1;
 			retopo_queue_updates(vd);
-			if(retopo_mesh_paint_check() && vd->retopo_view_data) {
-				/* Force redraw */
-				drawview3dspace(vd->area, vd);
-				retopo_paint_view_update(vd);
-			}
+			if(retopo_mesh_paint_check() && vd->retopo_view_data)
+				allqueue(REDRAWVIEW3D, 0);
 		}
 	}
 }

Modified: trunk/blender/source/blender/src/toets.c
===================================================================
--- trunk/blender/source/blender/src/toets.c	2007-12-18 17:29:35 UTC (rev 12938)
+++ trunk/blender/source/blender/src/toets.c	2007-12-18 21:56:17 UTC (rev 12939)
@@ -384,7 +384,6 @@
 
 	if(G.vd->depths) G.vd->depths->damaged= 1;
 	retopo_queue_updates(G.vd);
-	retopo_force_update();
 	
 	if(preview3d_event) 
 		BIF_view3d_previewrender_signal(curarea, PR_DBASE|PR_DISPRECT);