[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13809] trunk/blender/source/blender/src/ meshtools.c: Bugfix for [#6823] Bake button broken - No image

[Campbell Barton]

Revision: 13809
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13809
Author:   campbellbarton
Date:     2008-02-22 01:40:32 +0100 (Fri, 22 Feb 2008)

Log Message:
-----------
Bugfix for [#6823] Bake button broken - No image

Modified Paths:
--------------
    trunk/blender/source/blender/src/meshtools.c

Modified: trunk/blender/source/blender/src/meshtools.c
===================================================================
--- trunk/blender/source/blender/src/meshtools.c	2008-02-22 00:03:03 UTC (rev 13808)
+++ trunk/blender/source/blender/src/meshtools.c	2008-02-22 00:40:32 UTC (rev 13809)
@@ -1024,7 +1024,7 @@
 	short event;
 
 	event= pupmenu("Bake Selected Meshes %t|Full Render %x1|Ambient Occlusion %x2|Normals %x3|Texture Only %x4|Displacement %x5");
-	
+	if (event < 1) return;
 	objects_bake_render_ui(event);
 }
 
@@ -1150,7 +1150,15 @@
 void objects_bake_render_ui(short event)
 {
 	char *error_msg = NULL;
+	int is_editmode = (G.obedit!=NULL);
+	
+	/* Deal with editmode, this is a bit clunky but since UV's are in editmode, users are likely to bake from their */
+	if (is_editmode) exit_editmode(0);
+	
 	objects_bake_render(event, &error_msg);
+	
+	if (is_editmode) enter_editmode(0);
+	
 	if (error_msg)
 		error(error_msg);
 }