Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2007-09-15 22:12:16 +0400
committerCampbell Barton <ideasman42@gmail.com>2007-09-15 22:12:16 +0400
commit3a90f211d2cff5aa93bf0d52688685f9b7e92299 (patch)
treea873505ddc9cdd3891812c3f17b30147ab5f8f11 /source/blender/blenkernel
parentb2a8199d4ba545631a992af6a540dc2f2da186eb (diff)
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
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c2
1 files changed, 1 insertions, 1 deletions
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;
}
}