Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed bug #6711, Retopo problem when maximizing 3d view and still painting

Browse Source 
Caused by some incorrect usage of the current v3d during updates
This commit is contained in:
Nicholas Bishop
2007-12-18 21:56:17 +00:00
parent 84b58f8653
commit 5518aaaace
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/drawview.c
View File

@@ -3065,6 +3065,8 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
fdrawXORcirc((float)car[0], (float)car[1], sculptmode_brush()->size); fdrawXORcirc((float)car[0], (float)car[1], sculptmode_brush()->size);
} }
} }
retopo_paint_view_update(v3d);
retopo_draw_paint_lines(); retopo_draw_paint_lines();
if(!G.obedit && OBACT && G.f&G_PARTICLEEDIT && area_is_active_area(v3d->area)){ if(!G.obedit && OBACT && G.f&G_PARTICLEEDIT && area_is_active_area(v3d->area)){

4
source/blender/src/editscreen.c
View File

@@ -2443,9 +2443,6 @@ void area_fullscreen(void) /* with curarea */
wich_cursor(newa); wich_cursor(newa);
} }
if(curarea->full)
retopo_force_update();
/* there's also events in queue for this, but we call fullscreen for render output /* 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) */ 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) { for(sa= G.curscreen->areabase.first; sa; sa= sa->next) {
@@ -2455,7 +2452,6 @@ void area_fullscreen(void) /* with curarea */
/* bad code #2: setscreen() ends with first area active. fullscreen render assumes this too */ /* bad code #2: setscreen() ends with first area active. fullscreen render assumes this too */
curarea= sc->areabase.first; curarea= sc->areabase.first;
if(!curarea->full)
retopo_force_update(); retopo_force_update();
} }

7
source/blender/src/retopo.c
View File

@@ -452,11 +452,8 @@ void retopo_force_update()
if(vd) { if(vd) {
if(vd->depths) vd->depths->damaged= 1; if(vd->depths) vd->depths->damaged= 1;
retopo_queue_updates(vd); retopo_queue_updates(vd);
if(retopo_mesh_paint_check() && vd->retopo_view_data) { if(retopo_mesh_paint_check() && vd->retopo_view_data)
/* Force redraw */ allqueue(REDRAWVIEW3D, 0);
drawview3dspace(vd->area, vd);
retopo_paint_view_update(vd);
}
} }
} }
} }

1
source/blender/src/toets.c
View File

@@ -384,7 +384,6 @@ void persptoetsen(unsigned short event)
if(G.vd->depths) G.vd->depths->damaged= 1; if(G.vd->depths) G.vd->depths->damaged= 1;
retopo_queue_updates(G.vd); retopo_queue_updates(G.vd);
retopo_force_update();
if(preview3d_event) if(preview3d_event)
BIF_view3d_previewrender_signal(curarea, PR_DBASE|PR_DISPRECT); BIF_view3d_previewrender_signal(curarea, PR_DBASE|PR_DISPRECT);