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

no functional change

Browse Source 
- convert solidify edge crease values into chars once rather then for each edge.
- sort vertex was checking the array all the time when it wasnt needed.
This commit is contained in:
Campbell Barton
2010-04-08 16:08:06 +00:00
parent d8b2b388a7
commit 39d3ff135f
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/blenkernel/intern/modifier.c
View File

@@ -6028,7 +6028,11 @@ static DerivedMesh *solidifyModifier_applyModifier(ModifierData *md,
if(smd->flag & MOD_SOLIDIFY_RIM) {
static int edge_indices[4][4] = {
const unsigned char crease_rim= smd->crease_rim * 255.0f;
const unsigned char crease_outer= smd->crease_outer * 255.0f;
const unsigned char crease_inner= smd->crease_inner * 255.0f;
const int edge_indices[4][4] = {
{1, 0, 0, 1},
{2, 1, 1, 2},
{3, 2, 2, 3},
@@ -6041,8 +6045,8 @@ static DerivedMesh *solidifyModifier_applyModifier(ModifierData *md,
ed->v2= new_vert_arr[i] + numVerts;
ed->flag |= ME_EDGEDRAW;
if(smd->crease_rim)
ed->crease= smd->crease_rim * 255.0f;
if(crease_rim)
ed->crease= crease_rim;
}
/* faces */
@@ -6080,16 +6084,13 @@ static DerivedMesh *solidifyModifier_applyModifier(ModifierData *md,
mf->v2= ed->v1;
mf->v3= ed->v1 + numVerts;
mf->v4= ed->v2 + numVerts;
}
if(smd->crease_outer > 0.0f)
ed->crease= smd->crease_outer * 255.0f;
if(crease_outer)
ed->crease= crease_outer;
if(smd->crease_inner > 0.0f) {
ed= medge + (numEdges + eidx);
ed->crease= smd->crease_inner * 255.0f;
if(crease_inner) {
medge[numEdges + eidx].crease= crease_inner;
}
}

2
source/blender/editors/object/object_vgroup.c
View File

@@ -1976,7 +1976,7 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op)
}
else {
ED_vgroup_give_array(ob->data, &dvert, &dvert_tot);
while(dvert && dvert_tot--) {
while(dvert_tot--) {
if(dvert->totweight)
defvert_remap(dvert, sort_map);
dvert++;