[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12742] trunk/blender/source/blender/src:

[Brecht Van Lommel]

Revision: 12742
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12742
Author:   blendix
Date:     2007-12-01 13:34:15 +0100 (Sat, 01 Dec 2007)

Log Message:
-----------

Bugfix: baking ambient occlusion was broken without selected to active.

Increased the size limit (to 16384) and the default size (to 1024) for
the New Image function.

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

Modified: trunk/blender/source/blender/src/editsima.c
===================================================================
--- trunk/blender/source/blender/src/editsima.c	2007-12-01 12:08:46 UTC (rev 12741)
+++ trunk/blender/source/blender/src/editsima.c	2007-12-01 12:34:15 UTC (rev 12742)
@@ -2216,7 +2216,7 @@
 
 void new_image_sima(void)
 {
-	static int width= 256, height= 256;
+	static int width= 1024, height= 1024;
 	static short uvtestgrid= 0;
 	static float color[] = {0, 0, 0, 1};
 	char name[22];
@@ -2225,8 +2225,8 @@
 	strcpy(name, "Untitled");
 
 	add_numbut(0, TEX, "Name:", 0, 21, name, NULL);
-	add_numbut(1, NUM|INT, "Width:", 1, 5000, &width, NULL);
-	add_numbut(2, NUM|INT, "Height:", 1, 5000, &height, NULL);
+	add_numbut(1, NUM|INT, "Width:", 1, 16384, &width, NULL);
+	add_numbut(2, NUM|INT, "Height:", 1, 16384, &height, NULL);
 	add_numbut(3, COL, "", 0, 0, &color, NULL);
 	add_numbut(4, NUM|FLO, "Alpha:", 0.0, 1.0, &color[3], NULL);
 	add_numbut(5, TOG|SHO, "UV Test Grid", 0, 0, &uvtestgrid, NULL);

Modified: trunk/blender/source/blender/src/meshtools.c
===================================================================
--- trunk/blender/source/blender/src/meshtools.c	2007-12-01 12:08:46 UTC (rev 12741)
+++ trunk/blender/source/blender/src/meshtools.c	2007-12-01 12:34:15 UTC (rev 12742)
@@ -1021,7 +1021,7 @@
 		g_break= 0;
 		G.afbreek= 0;	/* blender_test_break uses this global */
 		
-		RE_Database_Baking(re, G.scene, event, actob);
+		RE_Database_Baking(re, G.scene, event, (active)? actob: NULL);
 		
 		/* baking itself is threaded, cannot use test_break in threads. we also update optional imagewindow */