Revision: 28551
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28551
Author: joeedh
Date: 2010-05-03 18:06:36 +0200 (Mon, 03 May 2010)
Log Message:
-----------
merge multires changes into trunk
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2010-05-03 16:00:42 UTC (rev 28550)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2010-05-03 16:06:36 UTC (rev 28551)
@@ -1741,7 +1741,6 @@
*/
if(mti->type == eModifierTypeType_OnlyDeform) {
-
/* No existing verts to deform, need to build them. */
if(!deformedVerts) {
if(dm) {
@@ -1867,10 +1866,14 @@
}
}
}
-
+
/* 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)
Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-05-03 16:00:42 UTC
(rev 28550)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c 2010-05-03 16:06:36 UTC
(rev 28551)
@@ -1214,6 +1214,8 @@
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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
