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

=== bugfix ===

Browse Source 
- possible fix for crash mentioned in [ #5781 ] Sculpt Brush Tool not working correctly
- workaround for possible compiler glitch with floating point conversion.
This commit is contained in:
Andrea Weikert
2007-02-14 19:40:17 +00:00
parent 4aa33f5633
commit 20a9712219
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/src/sculptmode.c
View File

@@ -1074,8 +1074,8 @@ float tex_strength(EditData *e, float *point, const float len,const unsigned vin
/* For Tile and Drag modes, get the 2D screen coordinates of the /* For Tile and Drag modes, get the 2D screen coordinates of the
and scale them up or down to the texture size. */ and scale them up or down to the texture size. */
if(sd->texrept==SCULPTREPT_TILE) { if(sd->texrept==SCULPTREPT_TILE) {
const float sx= sd->mtex[sd->texact]->size[0]; const int sx= (const int)sd->mtex[sd->texact]->size[0];
const float sy= sd->texsep ? sd->mtex[sd->texact]->size[1] : sx; const int sy= (const int)sd->texsep ? sd->mtex[sd->texact]->size[1] : sx;
float fx= pv.co[0]; float fx= pv.co[0];
float fy= pv.co[1]; float fy= pv.co[1];
@@ -1090,8 +1090,8 @@ float tex_strength(EditData *e, float *point, const float len,const unsigned vin
px= len * cos(angle) + 2000; px= len * cos(angle) + 2000;
py= len * sin(angle) + 2000; py= len * sin(angle) + 2000;
} }
px%= (int)sx; px %= sx;
py%= (int)sy; py %= sy;
p= get_ri_pixel(ri, ri->pr_rectx*px/sx, ri->pr_recty*py/sy); p= get_ri_pixel(ri, ri->pr_rectx*px/sx, ri->pr_recty*py/sy);
} else { } else {
float fx= (pv.co[0] - e->mouse[0] + half) * (ri->pr_rectx*1.0f/bsize) - ri->pr_rectx/2; float fx= (pv.co[0] - e->mouse[0] + half) * (ri->pr_rectx*1.0f/bsize) - ri->pr_rectx/2;