Revision: 19884
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19884
Author: blendix
Date: 2009-04-23 01:01:40 +0200 (Thu, 23 Apr 2009)
Log Message:
-----------
Fix for bug #14410: multires + vertex colors crash rendering
or baking while in editmode.
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 2009-04-22
22:38:23 UTC (rev 19883)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2009-04-22
23:01:40 UTC (rev 19884)
@@ -966,9 +966,9 @@
multires_update_colors(me, em);
}
-static void check_colors(Mesh *me)
+static void check_colors(Mesh *me, const int render)
{
- CustomData *src= G.obedit ? &G.editMesh->fdata : &me->fdata;
+ CustomData *src= (!render && G.obedit)? &G.editMesh->fdata : &me->fdata;
const char col= CustomData_has_layer(src, CD_MCOL);
/* Check if vertex colors have been deleted or added */
@@ -1110,7 +1110,7 @@
lvl= MEM_callocN(sizeof(MultiresLevel), "multireslevel");
if(me->pv) mesh_pmv_off(ob, me);
- check_colors(me);
+ check_colors(me, 0);
multires_update_levels(me, 0);
++me->mr->level_count;
@@ -1276,7 +1276,7 @@
{
if(me->pv) mesh_pmv_off(ob, me);
- check_colors(me);
+ check_colors(me, render);
multires_update_levels(me, render);
me->mr->current= me->mr->newlvl;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
