From 3a90f211d2cff5aa93bf0d52688685f9b7e92299 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 15 Sep 2007 18:12:16 +0000
Subject: new view option, SolidTex, to draw textures in solid mode. In the
 view panel as well as the shortcut Shift+T

this works in editmode as well as object mode

giving results like this
http://members.optusnet.com.au/cjbarton/temp1.jpg

where before you could only see textures in textured draw type like this
http://members.optusnet.com.au/cjbarton/temp2.jpg
---
 source/blender/makesdna/DNA_space_types.h  | 35 +++++++++++++++---------------
 source/blender/makesdna/DNA_view3d_types.h |  2 ++
 2 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'source/blender/makesdna')

diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 42f08e3795e..3e8d9d50d02 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -461,24 +461,25 @@ typedef struct SpaceImaSel {
 #define SI_SHOW			1
 
 /* SpaceImage->flag */
-#define SI_BE_SQUARE	1
-#define SI_EDITTILE		2
-#define SI_CLIP_UV		4
-#define SI_DRAWTOOL		8
-#define SI_STICKYUVS    16
-#define SI_DRAWSHADOW   32
-#define SI_SELACTFACE   64
-#define SI_DEPRECATED	128
-#define SI_LOCALSTICKY  256
-#define SI_COORDFLOATS  512
-#define SI_PIXELSNAP	1024
-#define SI_LIVE_UNWRAP	2048
-#define SI_USE_ALPHA	0x1000
-#define SI_SHOW_ALPHA	0x2000
-#define SI_SHOW_ZBUF	0x4000
+#define SI_BE_SQUARE	1<<0
+#define SI_EDITTILE		1<<1
+#define SI_CLIP_UV		1<<2
+#define SI_DRAWTOOL		1<<3
+#define SI_STICKYUVS    1<<4
+#define SI_DRAWSHADOW   1<<5
+#define SI_SELACTFACE   1<<6
+#define SI_DEPRECATED	1<<7
+#define SI_LOCALSTICKY  1<<8
+#define SI_COORDFLOATS  1<<9
+#define SI_PIXELSNAP	1<<10
+#define SI_LIVE_UNWRAP	1<<11
+#define SI_USE_ALPHA	1<<12
+#define SI_SHOW_ALPHA	1<<13
+#define SI_SHOW_ZBUF	1<<14
 		/* next two for render window dislay */
-#define SI_PREVSPACE	0x8000
-#define SI_FULLWINDOW	0x10000
+#define SI_PREVSPACE	1<<15
+#define SI_FULLWINDOW	1<<16
+#define SI_SYNC_UVSEL	1<<17
 
 /* SpaceText flags (moved from DNA_text_types.h) */
 
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 27cd20c3210..53f2a5aceeb 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -164,10 +164,12 @@ typedef struct View3D {
 #define V3D_CLIPPING		16384
 #define V3D_DRAW_CENTERS	32768
 
+
 /* View3d->flag2 (short) */
 #define V3D_OPP_DIRECTION_NAME	1
 #define V3D_FLYMODE				2
 #define V3D_TRANSFORM_SNAP		4
+#define V3D_SOLID_TEX			8
 
 /* View3d->snap_target */
 #define V3D_SNAP_TARGET_CLOSEST	0
-- 
cgit v1.2.3