sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Small interface update for multires; adding a new level should increment the render level as well, unless the render level has been set to something other than the max level. Also removed some unneeded code.

Browse Source
This commit is contained in:
Nicholas Bishop 2006-12-01 22:05:40 +00:00
parent b4b6dd2654
commit 662ce4a368
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/src/multires.c
View File

@ -920,6 +920,11 @@ void multires_add_level(void *ob, void *me_v)
multires_update_levels(me);
me->mr->newlvl= me->mr->level_count;
me->mr->current= me->mr->newlvl;
/* Unless the render level has been set to something other than the
highest level (by the user), increment the render level to match
the highest available level */
if(me->mr->renderlvl == me->mr->level_count - 1) me->mr->renderlvl= me->mr->level_count;
multires_level_to_mesh(ob,me);
if(em) enter_editmode(0);
@ -1341,30 +1346,18 @@ void multires_calc_level_maps(MultiresLevel *lvl)
}
}
unsigned powi(const unsigned b, const unsigned p)
{
unsigned i,r= b;
if(p==0) return 1;
for(i=1; i<p; ++i)
r*= b;
return r;
}
void multires_edge_level_update(void *ob, void *me_v)
{
Mesh *me= me_v;
MultiresLevel *cr_lvl= BLI_findlink(&me->mr->levels,me->mr->current-1);
MultiresLevel *edge_lvl= BLI_findlink(&me->mr->levels,me->mr->edgelvl-1);
const int threshold= edge_lvl->totedge * powf(2, me->mr->current - me->mr->edgelvl);
unsigned i;
for(i=0; i<cr_lvl->totedge; ++i) {
const int ndx= me->pv ? me->pv->edge_map[i] : i;
if(ndx != -1) { /* -1= hidden edge */
if(me->mr->edgelvl >= me->mr->current ||
i<edge_lvl->totedge*powi(2,me->mr->current-me->mr->edgelvl))
if(me->mr->edgelvl >= me->mr->current || i<threshold)
me->medge[ndx].flag= ME_EDGEDRAW;
else
me->medge[ndx].flag= 0;