[Bf-blender-cvs] [39fd299] master: Forgot to theme-ify color of shadow UVs (color used to draw uvs during image painting)

Antony Riakiotakis noreply at git.blender.org
Thu Dec 5 22:12:38 CET 2013


Commit: 39fd299498a6315ca854732fa3c827fe27443c0f
Author: Antony Riakiotakis
Date:   Thu Dec 5 23:06:41 2013 +0200
http://developer.blender.org/rB39fd299498a6315ca854732fa3c827fe27443c0f

Forgot to theme-ify color of shadow UVs (color used to draw uvs during
image painting)

===================================================================

M	source/blender/editors/uvedit/uvedit_draw.c
M	source/blender/makesdna/DNA_userdef_types.h

===================================================================

diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index d20ef0e..d852982 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -141,7 +141,7 @@ static void draw_uvs_shadow(Object *obedit)
 	const int cd_loop_uv_offset = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
 
 	/* draws the gray mesh when painting */
-	glColor3ub(112, 112, 112);
+	UI_ThemeColor(TH_UV_SHADOW);
 
 	BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 		glBegin(GL_LINE_LOOP);
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index c2f1593..b65c7c1 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -286,8 +286,8 @@ typedef struct ThemeSpace {
 	char preview_stitch_unstitchable[4];
 	char preview_stitch_active[4];
 	
-	char uv_shadow[4];
-	char uv_others[4];
+	char uv_shadow[4]; /* two uses, for uvs with modifier applied on mesh and uvs during painting */
+	char uv_others[4]; /* uvs of other objects */
 
 	char match[4];				/* outliner - filter match */
 	char selected_highlight[4];	/* outliner - selected item */




More information about the Bf-blender-cvs mailing list