[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13011] trunk/blender/source/blender/ blenkernel/intern/multires.c: == Multires ==

[Nicholas Bishop]

Revision: 13011
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13011
Author:   nicholasbishop
Date:     2007-12-26 21:43:58 +0100 (Wed, 26 Dec 2007)

Log Message:
-----------
== Multires ==

Fixed multires_update_colors so it ignores the editmesh during render.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/multires.c

Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c	2007-12-26 19:30:49 UTC (rev 13010)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c	2007-12-26 20:43:58 UTC (rev 13011)
@@ -856,11 +856,10 @@
 	if(cr_mat_damaged) MEM_freeN(cr_mat_damaged);
 }
 
-void multires_update_colors(Mesh *me)
+static void multires_update_colors(Mesh *me, EditMesh *em)
 {
 	MultiresLevel *lvl= BLI_findlink(&me->mr->levels,me->mr->current-1);
 	MultiresCol *pr_deltas= NULL, *cr_deltas= NULL;
-	EditMesh *em= G.obedit ? G.editMesh : NULL;
 	CustomData *src= em ? &em->fdata : &me->fdata;
 	EditFace *efa= NULL;
 	unsigned i,j,curf= 0;
@@ -961,7 +960,7 @@
 	multires_update_first_level(me, em);
 	multires_update_vertices(me, em);
 	multires_update_faces(me, em);
-	multires_update_colors(me);
+	multires_update_colors(me, em);
 }
 
 static void check_colors(Mesh *me)