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

[Nicholas Bishop]

Revision: 11576
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11576
Author:   nicholasbishop
Date:     2007-08-13 23:08:52 +0200 (Mon, 13 Aug 2007)

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

Partial fix for bug #7013, adding multires removes all vertex color layers

* Added a warning when adding multires levels to a mesh with more than one vcol layer. The user can choose to allow multires to delete the non-active layer(s), or cancel.

Note that this is a temporary fix; a better solution will be to make multiple vcol layers work with multires.

Modified Paths:
--------------
    trunk/blender/source/blender/src/multires.c

Modified: trunk/blender/source/blender/src/multires.c
===================================================================
--- trunk/blender/source/blender/src/multires.c	2007-08-13 19:19:18 UTC (rev 11575)
+++ trunk/blender/source/blender/src/multires.c	2007-08-13 21:08:52 UTC (rev 11576)
@@ -823,14 +823,21 @@
 {
 	int i,j, curf, cure;
 	Mesh *me= me_v;
-	MultiresLevel *lvl= MEM_callocN(sizeof(MultiresLevel), "multireslevel");
+	MultiresLevel *lvl= NULL;
 	MultiApplyData data;
 	MVert *oldverts= NULL;
 	
 	multires_check_state();
 
+	if(CustomData_number_of_layers(G.obedit ? &G.editMesh->fdata : &me->fdata, CD_MCOL) > 1) {
+		int ret= okee("Adding a level will delete all but the active vertex color layer, proceed?");
+		if(!ret)
+			return;
+	}
+
 	waitcursor(1);
 
+	lvl= MEM_callocN(sizeof(MultiresLevel), "multireslevel");
 	if(me->pv) sculptmode_pmv_off(me);
 
 	check_colors(me);