[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38337] branches/soc-2011-onion/source/ blender/editors/uvedit/uvedit_draw.c: -UVs of other objects are shown in texture paint mode if draw other objects is checked .

[Antony Riakiotakis]

Revision: 38337
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38337
Author:   psy-fi
Date:     2011-07-12 15:32:07 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
-UVs of other objects are shown in texture paint mode if draw other objects is checked.

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_draw.c

Modified: branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_draw.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_draw.c	2011-07-12 15:08:02 UTC (rev 38336)
+++ branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_draw.c	2011-07-12 15:32:07 UTC (rev 38337)
@@ -383,13 +383,10 @@
 	}
 }
 
-static void draw_uvs_other(Scene *scene, Object *obedit, MTFace *activetf)
+static void draw_uvs_other(Scene *scene, Object *obedit, Image *curimage)
 {
 	Base *base;
-	Image *curimage;
 
-	curimage= (activetf)? activetf->tpage: NULL;
-
 	glColor3ub(96, 96, 96);
 
 	for(base=scene->base.first; base; base=base->next) {
@@ -422,10 +419,13 @@
 	}
 }
 
-static void draw_uvs_texpaint(Object *ob, Image *curimage)
+static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob, Image *curimage)
 {
 	Mesh *me= ob->data;
 
+	if(sima->flag & SI_DRAW_OTHER)
+		draw_uvs_other(scene, ob, curimage);
+
 	glColor3ub(96, 96, 96);
 
 	if(me->mtface) {
@@ -474,8 +474,12 @@
 	
 	/* draw other uvs */
 	if(sima->flag & SI_DRAW_OTHER)
-		draw_uvs_other(scene, obedit, activetf);
+	{
+		Image *curimage= (activetf)? activetf->tpage: NULL;
 
+		draw_uvs_other(scene, obedit, curimage);
+	}
+
 	/* 1. draw shadow mesh */
 	
 	if(sima->flag & SI_DRAWSHADOW) {
@@ -928,7 +932,7 @@
 			draw_uvs(sima, scene, obedit);
 		else {
 			Image *ima = ED_space_image(sima);
-			draw_uvs_texpaint(paint_ob, ima);
+			draw_uvs_texpaint(sima, scene, paint_ob, ima);
 		}
 
 		if(show_uvedit)