archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Two bugfixes, irc report:

Browse Source 
- WeightPaint used 'max vertices' as 'max faces' for paint, so some faces
  could not be painted on. (bug introduced last week, with global undo)

- Bake Render: when no Image window open, baking crashed.
This commit is contained in:
Ton Roosendaal
2006-11-30 18:20:14 +00:00
parent 94da40a3d8
commit e565bbd298
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -897,7 +897,7 @@ void objects_bake_render(void)
g_break= blender_test_break(); g_break= blender_test_break();
timer++; timer++;
if(timer==20) { if(area && timer==20) {
Image *ima= RE_bake_shade_get_image(); Image *ima= RE_bake_shade_get_image();
if(ima) ((SpaceImage *)area->spacedata.first)->image= ima; if(ima) ((SpaceImage *)area->spacedata.first)->image= ima;
scrarea_do_windraw(area); scrarea_do_windraw(area);

14
source/blender/src/vpaint.c
View File

@@ -734,13 +734,13 @@ static void vpaint_blend( unsigned int *col, unsigned int *colorig, unsigned int
} }
static int sample_backbuf_area(VPaint *vp, int *indexar, int x, int y, float size) static int sample_backbuf_area(VPaint *vp, int *indexar, int totface, int x, int y, float size)
{ {
unsigned int *rt; unsigned int *rt;
struct ImBuf *ibuf; struct ImBuf *ibuf;
int x1, y1, x2, y2, a, tot=0, index; int x1, y1, x2, y2, a, tot=0, index;
if(vp->tot>=MAXINDEX) return 0; if(totface>=MAXINDEX) return 0;
if(size>64.0) size= 64.0; if(size>64.0) size= 64.0;
@@ -770,20 +770,20 @@ static int sample_backbuf_area(VPaint *vp, int *indexar, int x, int y, float siz
size= (y2-y1)*(x2-x1); size= (y2-y1)*(x2-x1);
if(size<=0) return 0; if(size<=0) return 0;
memset(indexar, 0, sizeof(int)*vp->tot+2); /* plus 2! first element is total */ memset(indexar, 0, sizeof(int)*totface+2); /* plus 2! first element is total */
while(size--) { while(size--) {
if(*rt) { if(*rt) {
index= framebuffer_to_index(*rt); index= framebuffer_to_index(*rt);
if(index>0 && index<=vp->tot) if(index>0 && index<=totface)
indexar[index] = 1; indexar[index] = 1;
} }
rt++; rt++;
} }
for(a=1; a<=vp->tot; a++) { for(a=1; a<=totface; a++) {
if(indexar[a]) indexar[tot++]= a; if(indexar[a]) indexar[tot++]= a;
} }
@@ -1193,7 +1193,7 @@ void weight_paint(void)
/* which faces are involved */ /* which faces are involved */
if(Gwp.flag & VP_AREA) { if(Gwp.flag & VP_AREA) {
totindex= sample_backbuf_area(&Gwp, indexar, mval[0], mval[1], Gwp.size); totindex= sample_backbuf_area(&Gwp, indexar, me->totface, mval[0], mval[1], Gwp.size);
} }
else { else {
indexar[0]= sample_backbuf(mval[0], mval[1]); indexar[0]= sample_backbuf(mval[0], mval[1]);
@@ -1413,7 +1413,7 @@ void vertex_paint()
/* which faces are involved */ /* which faces are involved */
if(Gvp.flag & VP_AREA) { if(Gvp.flag & VP_AREA) {
totindex= sample_backbuf_area(&Gvp, indexar, mval[0], mval[1], Gvp.size); totindex= sample_backbuf_area(&Gvp, indexar, me->totface, mval[0], mval[1], Gvp.size);
} }
else { else {
indexar[0]= sample_backbuf(mval[0], mval[1]); indexar[0]= sample_backbuf(mval[0], mval[1]);