[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15288] branches/soc-2008-nicholasbishop/ source/blender/blenkernel/intern/multires.c: Fixed updating displacements for meshes with more than one polygon

[Nicholas Bishop]

Revision: 15288
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15288
Author:   nicholasbishop
Date:     2008-06-20 20:19:37 +0200 (Fri, 20 Jun 2008)

Log Message:
-----------
Fixed updating displacements for meshes with more than one polygon

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-20 18:06:41 UTC (rev 15287)
+++ branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/multires.c	2008-06-20 18:19:37 UTC (rev 15288)
@@ -1557,9 +1557,10 @@
 	
 	if(mdisps) {
 		MultiresDisplacer d;
+		float (*subco)[3] = MultiresDM_get_subco(dm);
 		
 		mvert = CDDM_get_verts(dm);
-		mface = CDDM_get_faces(dm);
+		mface = MultiresDM_get_orfa(dm);
 
 		/* For now just handle top-level sculpts */
 		for(i = 0; i < MultiresDM_get_totorfa(dm); ++i) {
@@ -1569,6 +1570,7 @@
 			
 			// convert from mvert->co to disps
 			multires_displacer_init(&d, dm, i, numVerts, 1);
+			d.subco = subco;
 			multires_displacer_anchor(&d, 1, 0);
 			multires_displace(&d, mvert->co);
 			++mvert;
@@ -1591,6 +1593,8 @@
 					multires_displacer_jump(&d);
 				}
 			}
+
+			subco = d.subco;
 		}
 	}
 }