[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41109] branches/soc-2011-onion-uv-tools: draw uvs of current mesh lighter than uvs of other meshes in texture paint mode

[Antony Riakiotakis]

Revision: 41109
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41109
Author:   psy-fi
Date:     2011-10-18 21:53:33 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
draw uvs of current mesh lighter than uvs of other meshes in texture paint mode

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_draw.c

Modified: branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py	2011-10-18 21:20:39 UTC (rev 41108)
+++ branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py	2011-10-18 21:53:33 UTC (rev 41109)
@@ -52,8 +52,9 @@
         layout.prop(sima, "use_realtime_update")
         if show_uvedit:
             layout.prop(toolsettings, "show_uv_local_view")
-            layout.prop(uv, "show_other_objects")
 
+        layout.prop(uv, "show_other_objects")
+
         layout.separator()
 
         layout.operator("image.view_zoom_in")

Modified: branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_draw.c
===================================================================
--- branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_draw.c	2011-10-18 21:20:39 UTC (rev 41108)
+++ branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_draw.c	2011-10-18 21:53:33 UTC (rev 41109)
@@ -419,14 +419,15 @@
 	}
 }
 
-static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob, Image *curimage)
+static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob)
 {
 	Mesh *me= ob->data;
+	Image *curimage = ED_space_image(sima);
 
 	if(sima->flag & SI_DRAW_OTHER)
 		draw_uvs_other(scene, ob, curimage);
 
-	glColor3ub(96, 96, 96);
+	glColor3ub(112, 112, 112);
 
 	if(me->mtface) {
 		MFace *mface= me->mface;
@@ -941,8 +942,7 @@
 		else if(show_uvedit)
 			draw_uvs(sima, scene, obedit);
 		else {
-			Image *ima = ED_space_image(sima);
-			draw_uvs_texpaint(sima, scene, paint_ob, ima);
+			draw_uvs_texpaint(sima, scene, paint_ob);
 		}
 
 		if(show_uvedit && !(toolsettings->use_uv_sculpt))