diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-09-11 00:12:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-09-11 00:12:38 +0400 |
| commit | 047a2ff0c39445d9329eb97a14a9bdd5b1c6b5b5 (patch) | |
| tree | 71157e5b241df3f5ffab56af04915cdcd832535f /source | |
| parent | 0bd32f3ac60393fca5af17534c8ee90e20664cbd (diff) | |
draw shadowmesh wasnt working and the button in the header for selecting faces in paint mode was drawn in editmode.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/drawimage.c | 2 | ||||
| -rw-r--r-- | source/blender/src/header_view3d.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index d8e6a1a334e..46526a138df 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -390,7 +390,7 @@ void draw_tfaces(void) glLoadIdentity(); /* draw shadow mesh */ - if ((G.sima->flag & SI_DRAWSHADOW) && !(G.obedit==OBACT)) { /* TODO - editmesh */ + if ((G.sima->flag & SI_DRAWSHADOW) && (G.obedit==OBACT)) { /* TODO - editmesh */ DerivedMesh *dm; /* draw final mesh with modifiers applied */ diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index a9aae6d2187..bcbad9d2893 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -5203,7 +5203,7 @@ void view3d_buttons(void) uiBlockEndAlign(block); } } else { - if (G.f & (G_VERTEXPAINT|G_WEIGHTPAINT|G_TEXTUREPAINT)) { + if (G.obedit==NULL && (G.f & (G_VERTEXPAINT|G_WEIGHTPAINT|G_TEXTUREPAINT))) { uiDefIconButBitI(block, TOG, G_FACESELECT, B_REDR, ICON_FACESEL_HLT,xco,0,XIC,YIC, &G.f, 0, 0, 0, 0, "Painting Mask (FKey)"); xco+= XIC+10; } else { |