[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12119] trunk/blender/source/blender/src: drawimage wasnt updating when shadow mesh was enabled

[Campbell Barton]

Revision: 12119
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12119
Author:   campbellbarton
Date:     2007-09-23 17:10:41 +0200 (Sun, 23 Sep 2007)

Log Message:
-----------
drawimage wasnt updating when shadow mesh was enabled
transform manipulator was shown in sculpt mode which is inconsistant sicne G key dosnt work and other painting modes have this disabled. - thanks theeth for finding this.

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

Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c	2007-09-23 14:19:54 UTC (rev 12118)
+++ trunk/blender/source/blender/src/drawimage.c	2007-09-23 15:10:41 UTC (rev 12119)
@@ -406,6 +406,8 @@
 	int wi, hi;
 	float w, h;
 	
+	if (!G.obedit) return;
+	
 	transform_width_height_tface_uv(&wi, &hi);
 	w = (((float)wi)/256.0f)*G.sima->zoom * xuser_asp;
 	h = (((float)hi)/256.0f)*G.sima->zoom * yuser_asp;
@@ -1794,7 +1796,7 @@
 		 * are normally done in drawview and could get here before
 		 * drawing a View3D.
 		 */
-	if (!G.obedit && OBACT && (sima->flag & SI_DRAWSHADOW)) {
+	if (G.obedit && OBACT && (sima->flag & SI_DRAWSHADOW)) {
 		object_handle_update(OBACT);
 	}
 	

Modified: trunk/blender/source/blender/src/transform_manipulator.c
===================================================================
--- trunk/blender/source/blender/src/transform_manipulator.c	2007-09-23 14:19:54 UTC (rev 12118)
+++ trunk/blender/source/blender/src/transform_manipulator.c	2007-09-23 15:10:41 UTC (rev 12119)
@@ -427,7 +427,7 @@
 		/* restore, mode can be TFM_INIT */
 		Trans.mode= mode;
 	}
-	else if(G.f & (G_VERTEXPAINT + G_TEXTUREPAINT +G_WEIGHTPAINT)) {
+	else if(G.f & (G_VERTEXPAINT + G_TEXTUREPAINT + G_WEIGHTPAINT + G_SCULPTMODE)) {
 		;
 	}
 	else {