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>2011-07-25 18:54:29 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-07-25 18:54:29 +0400
commit619927605355a0b66e1ecd8f8a8bf1fe31b68d07 (patch)
tree384a5b47f09aeeb30f984216e0aae6aeb68c2e0f /source/blender/editors/uvedit/uvedit_draw.c
parent2dc6b8f835b87480a9451c91e684271a55554006 (diff)
parent3c43e8e50ac991b082c143c634e4776aaca02db1 (diff)
svn merge -r37800:37900 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_draw.c')
-rw-r--r--source/blender/editors/uvedit/uvedit_draw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index eb210822edb..beb65875ea2 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -527,7 +527,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
if(sima->flag & SI_DRAW_STRETCH) {
draw_uvs_stretch(sima, scene, em, activetf);
}
- else if(me->drawflag & ME_DRAWFACES) {
+ else if(!(sima->flag & SI_NO_DRAWFACES)) {
/* draw transparent faces */
UI_GetThemeColor4ubv(TH_FACE, col1);
UI_GetThemeColor4ubv(TH_FACE_SELECT, col2);