[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16686] trunk/blender/source/blender/src/ editsima.c: Fix for part of bug #17506: uv editing with multires is only

[Brecht Van Lommel]

Revision: 16686
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16686
Author:   blendix
Date:     2008-09-22 22:26:28 +0200 (Mon, 22 Sep 2008)

Log Message:
-----------
Fix for part of bug #17506: uv editing with multires is only
allowed at level 1, missed a case.

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

Modified: trunk/blender/source/blender/src/editsima.c
===================================================================
--- trunk/blender/source/blender/src/editsima.c	2008-09-22 19:54:30 UTC (rev 16685)
+++ trunk/blender/source/blender/src/editsima.c	2008-09-22 20:26:28 UTC (rev 16686)
@@ -2654,15 +2654,9 @@
 	MTFace *tface;
 	EditMesh *em = G.editMesh;
 	EditFace *efa;
-	ImBuf *ibuf = NULL;
+	/*ImBuf *ibuf = NULL;*/
 	short change = 0;
 	
-	if(image==NULL) {
-		sima->flag &= ~SI_DRAWTOOL;
-	} else {
-		ibuf = BKE_image_get_ibuf(image, NULL);
-	}
-	
 	if(sima->mode!=SI_TEXTURE)
 		return;
 	
@@ -2675,6 +2669,9 @@
 			(G.editMesh->faces.first)
 		) {
 		
+		if(!is_uv_tface_editing_allowed())
+			return;
+		
 		/* Add a UV layer if there is none, editmode only */
 		if ( !CustomData_has_layer(&G.editMesh->fdata, CD_MTFACE) ) {
 			EM_add_data_layer(&em->fdata, CD_MTFACE);
@@ -2685,6 +2682,11 @@
 			allqueue(REDRAWVIEW3D, 0);
 			allqueue(REDRAWBUTSEDIT, 0);
 		}
+
+#if 0
+		if(image)
+			ibuf = BKE_image_get_ibuf(image, NULL);
+#endif
 		
 		for (efa= em->faces.first; efa; efa= efa->next) {
 			tface = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
@@ -2714,9 +2716,13 @@
 			}
 		}
 	}
+
 	/* change the space image after because simaFaceDraw_Check uses the space image
 	 * to check if the face is displayed in UV-localview */
 	sima->image = image;
+
+	if(sima->image==NULL)
+		sima->flag &= ~SI_DRAWTOOL;
 	
 	if (change)
 		object_uvs_changed(OBACT);