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

merge multires changes into trunk

Browse Source
This commit is contained in:
Joseph Eagar 2010-05-03 16:06:36 +00:00
parent 245ab753f5
commit afa872200c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -1741,7 +1741,6 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
*/
if(mti->type == eModifierTypeType_OnlyDeform) {
/* No existing verts to deform, need to build them. */
if(!deformedVerts) {
if(dm) {
@ -1867,10 +1866,14 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
}
}
}
/* grab modifiers until index i */
if((index >= 0) && (modifiers_indexInObject(ob, md) >= index))
break;
/*don't allow other modifiers past multires if in sculpt mode*/
if (!useRenderParams && ((ob->mode & OB_MODE_SCULPT) && ob->sculpt))
break;
}
for(md=firstmd; md; md=md->next)

2
source/blender/blenlib/intern/pbvh.c
View File

@ -1214,6 +1214,8 @@ int BLI_pbvh_node_raycast(PBVH *bvh, PBVHNode *node, float (*origco)[3],
for(i = 0; i < totgrid; ++i) {
DMGridData *grid= bvh->grids[node->prim_indices[i]];
if (!grid)
continue;
for(y = 0; y < gridsize-1; ++y) {
for(x = 0; x < gridsize-1; ++x) {