griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

adjustments to sculpt cache scaling code, (float/double promotion)

Browse Source
This commit is contained in:
Campbell Barton
2013-10-03 03:05:41 +00:00
parent 6ff35258c0
commit 58fe3435b4
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/sculpt_paint/sculpt.c
View File

@@ -3795,30 +3795,27 @@ static void sculpt_update_cache_invariants(bContext *C, Sculpt *sd, SculptSessio
Object *ob = CTX_data_active_object(C);
float mat[3][3];
float viewDir[3] = {0.0f, 0.0f, 1.0f};
float max_scale;
int i;
int mode;
ss->cache = cache;
/* Set scaling adjustment */
if (brush->sculpt_tool == SCULPT_TOOL_LAYER) {
cache->scale[0] = 1.0f / ob->size[0];
cache->scale[1] = 1.0f / ob->size[1];
cache->scale[2] = 1.0f / ob->size[2];
max_scale = 1.0f;
}
else {
float max_scale = 0.0f;
max_scale = 0.0f;
for (i = 0; i < 3; i ++) {
if (fabs(ob->size[i]) > max_scale)
max_scale = fabs(ob->size[i]);
max_scale = max_ff(max_scale, fabsf(ob->size[i]));
}
cache->scale[0] = max_scale / ob->size[0];
cache->scale[1] = max_scale / ob->size[1];
cache->scale[2] = max_scale / ob->size[2];
}
cache->scale[0] = max_scale / ob->size[0];
cache->scale[1] = max_scale / ob->size[1];
cache->scale[2] = max_scale / ob->size[2];
cache->plane_trim_squared = brush->plane_trim * brush->plane_trim;
cache->flag = 0;