[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11998] trunk/blender/source/blender/src: draw shadowmesh wasnt working and the button in the header for selecting faces in paint mode was drawn in editmode .

[Campbell Barton]

Revision: 11998
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11998
Author:   campbellbarton
Date:     2007-09-10 22:12:38 +0200 (Mon, 10 Sep 2007)

Log Message:
-----------
draw shadowmesh wasnt working and the button in the header for selecting faces in paint mode was drawn in editmode.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawimage.c
    trunk/blender/source/blender/src/header_view3d.c

Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c	2007-09-10 19:32:44 UTC (rev 11997)
+++ trunk/blender/source/blender/src/drawimage.c	2007-09-10 20:12:38 UTC (rev 11998)
@@ -390,7 +390,7 @@
 			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 */

Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c	2007-09-10 19:32:44 UTC (rev 11997)
+++ trunk/blender/source/blender/src/header_view3d.c	2007-09-10 20:12:38 UTC (rev 11998)
@@ -5203,7 +5203,7 @@
  			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 {