Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2007-12-26 23:43:58 +0300
committerNicholas Bishop <nicholasbishop@gmail.com>2007-12-26 23:43:58 +0300
commit8e84f64c3daa5cd2cafc7fd14d7d0fad472298cf (patch)
treeea9086ad617af38687308ddeb0a5eef69fa817f4 /source
parent6d13d4473418be180a345df4fb4375f03e7e256c (diff)
== Multires ==
Fixed multires_update_colors so it ignores the editmesh during render.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/multires.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 2a9ac65b083..c402d59f2c0 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -856,11 +856,10 @@ static void multires_update_faces(Mesh *me, EditMesh *em)
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 @@ void multires_update_levels(Mesh *me, const int render)
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)