Revision: 15300
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15300
Author: nicholasbishop
Date: 2008-06-22 01:00:26 +0200 (Sun, 22 Jun 2008)
Log Message:
-----------
Fixed "exploding" vertices in the base mesh.
Modified Paths:
--------------
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
Modified:
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
===================================================================
---
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
2008-06-21 21:56:17 UTC (rev 15299)
+++
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c
2008-06-21 23:00:26 UTC (rev 15300)
@@ -1539,6 +1539,9 @@
void multires_displacer_anchor_vert(MultiresDisplacer *d, const int v)
{
const int e = d->sidetot - 1;
+
+ d->type = 5;
+
d->x = d->y = 0;
if(v == d->face->v2)
d->x = e;
@@ -1546,8 +1549,6 @@
d->x = d->y = e;
else if(v == d->face->v4)
d->y = e;
-
- d->type = 5;
}
void multires_displacer_jump(MultiresDisplacer *d)
@@ -1591,7 +1592,7 @@
}
else {
- if(d->type == 4)
+ if(d->type == 4 || d->type == 5)
VecMulf(disp, d->weight);
VecAddf(co, co, disp);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
