From 3a90f211d2cff5aa93bf0d52688685f9b7e92299 Mon Sep 17 00:00:00 2001 From: Campbell Barton 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/blenkernel/intern/DerivedMesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index ab5a3a9a531..ff98f6f642e 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1793,7 +1793,7 @@ CustomDataMask get_viewedit_datamask() /* this includes normals for mesh_create_shadedColors */ mask |= CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_NORMAL; } - if(view->drawtype == OB_TEXTURE) { + if((view->drawtype == OB_TEXTURE) || ((view->drawtype == OB_SOLID) && (view->flag2 & V3D_SOLID_TEX))) { mask |= CD_MASK_MTFACE | CD_MASK_MCOL; } } -- cgit v1.2.3