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

Bug in new "generated image": when you save it, it didn't set the type to

Browse Source 
'non generated' correctly.

Also: tooltip fix for radio pass.
This commit is contained in:
Ton Roosendaal
2006-12-20 22:03:06 +00:00
parent e6c8702e7b
commit 1acb49e69d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1857,7 +1857,7 @@ static void render_panel_layers(void)
uiDefButBitI(block, BUT_TOGDUAL, SCE_PASS_AO, B_SET_PASS,"AO", 160, 10, 30, 20, &srl->passflag, 0, 0, 0, 0, "Deliver AO pass");
uiDefButBitI(block, BUT_TOGDUAL, SCE_PASS_REFLECT, B_SET_PASS,"Refl", 190, 10, 40, 20, &srl->passflag, 0, 0, 0, 0, "Deliver Raytraced Reflection pass");
uiDefButBitI(block, BUT_TOGDUAL, SCE_PASS_REFRACT, B_SET_PASS,"Refr", 230, 10, 40, 20, &srl->passflag, 0, 0, 0, 0, "Deliver Raytraced Refraction pass");
uiDefButBitI(block, BUT_TOGDUAL, SCE_PASS_RADIO, B_SET_PASS,"Rad", 270, 10, 40, 20, &srl->passflag, 0, 0, 0, 0, "Deliver Raytraced Refraction pass");
uiDefButBitI(block, BUT_TOGDUAL, SCE_PASS_RADIO, B_SET_PASS,"Rad", 270, 10, 40, 20, &srl->passflag, 0, 0, 0, 0, "Deliver Radiosity pass");
}
void render_panels()

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

@@ -1675,8 +1675,10 @@ static void save_image_doit(char *name)
ibuf->userflags &= ~IB_BITMAPDIRTY;
/* change type? */
if( ELEM(ima->source, IMA_SRC_GENERATED, IMA_SRC_VIEWER))
if( ELEM(ima->source, IMA_SRC_GENERATED, IMA_SRC_VIEWER)) {
ima->source= IMA_SRC_FILE;
ima->type= IMA_TYPE_IMAGE;
}
if(ima->type==IMA_TYPE_R_RESULT)
ima->type= IMA_TYPE_IMAGE;