[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14085] trunk/blender/source/blender/src/ buttons_editing.c:

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Mar 13 12:42:33 CET 2008


Revision: 14085
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14085
Author:   blendix
Date:     2008-03-13 12:42:32 +0100 (Thu, 13 Mar 2008)

Log Message:
-----------

Fix for bug #8387: active uv layer index could become invalid in editmode.

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

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2008-03-13 11:26:18 UTC (rev 14084)
+++ trunk/blender/source/blender/src/buttons_editing.c	2008-03-13 11:42:32 UTC (rev 14085)
@@ -4704,21 +4704,19 @@
 			break;
 
 		case B_NEWTFACE:
-			if(me)
-				layernum= CustomData_number_of_layers(&me->fdata, CD_MTFACE);
-			else
-				layernum= CustomData_number_of_layers(&em->fdata, CD_MTFACE);
-
 			if(me && me->mr) {
+				layernum= CustomData_number_of_layers(&me->fdata, CD_MTFACE);
 				multires_add_layer(me, &me->mr->fdata, CD_MTFACE, layernum);
 				multires_level_to_editmesh(ob, me, 0);
 				multires_finish_mesh_update(ob);
 			}
 			else if(G.obedit) {
+				layernum= CustomData_number_of_layers(&em->fdata, CD_MTFACE);
 				EM_add_data_layer(&em->fdata, CD_MTFACE);
 				CustomData_set_layer_active(&em->fdata, CD_MTFACE, layernum);
 			}
 			else if(me) {
+				layernum= CustomData_number_of_layers(&me->fdata, CD_MTFACE);
 				if(me->mtface)
 					CustomData_add_layer(&me->fdata, CD_MTFACE, CD_DUPLICATE,
 					                     me->mtface, me->totface);





More information about the Bf-blender-cvs mailing list