Revision: 35485
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35485
Author: nicholasbishop
Date: 2011-03-12 02:59:47 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
== Sculpt ==
Missed a couple bad object assignments in last commit.
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2011-03-12
02:12:02 UTC (rev 35484)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2011-03-12
02:59:47 UTC (rev 35485)
@@ -2396,9 +2396,9 @@
}
/* flush displacement from deformed PBVH vertex to original mesh */
-static void sculpt_flush_pbvhvert_deform(SculptSession *ss, PBVHVertexIter *vd)
+static void sculpt_flush_pbvhvert_deform(Object *ob, PBVHVertexIter *vd)
{
- Object *ob= ob;
+ SculptSession *ss = ob->sculpt;
Mesh *me= ob->data;
float disp[3], newco[3];
int index= vd->vert_indices[vd->i];
@@ -2455,7 +2455,7 @@
sculpt_clip(sd, ss, vd.co, val);
if(ss->modifiers_active)
- sculpt_flush_pbvhvert_deform(ss, &vd);
+ sculpt_flush_pbvhvert_deform(ob, &vd);
}
BLI_pbvh_vertex_iter_end;
@@ -2509,7 +2509,7 @@
PBVHVertexIter vd;
BLI_pbvh_vertex_iter_begin(ss->pbvh, nodes[n],
vd, PBVH_ITER_UNIQUE) {
- sculpt_flush_pbvhvert_deform(ss, &vd);
+ sculpt_flush_pbvhvert_deform(ob, &vd);
}
BLI_pbvh_vertex_iter_end;
}
@@ -2676,8 +2676,6 @@
SculptSession *ss = ob->sculpt;
MultiresModifierData *mmd= sculpt_multires_active(scene, ob);
- ob= ob;
-
ss->modifiers_active= sculpt_modifiers_active(scene, ob);
if((ob->shapeflag & OB_SHAPE_LOCK) && !mmd) ss->kb= ob_get_keyblock(ob);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
