griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Increased the size limit (to 16384) and the default size (to 1024) for
the New Image function.
This commit is contained in:
Brecht Van Lommel
2007-12-01 12:34:15 +00:00
parent 4813af326b
commit fc91991432
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/src/editsima.c
View File

@@ -2216,7 +2216,7 @@ void reload_image_sima(void)
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 @@ void new_image_sima(void)
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);

2
source/blender/src/meshtools.c
View File

@@ -1021,7 +1021,7 @@ void objects_bake_render(short event)
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 */