archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 50956.

Browse Source 
Conflicts resolved:
source/blender/editors/interface/resources.c
This commit is contained in:
Tamito Kajiyama
2012-09-30 13:16:55 +00:00
parent a42ba82f63 818b2e81da
commit e91f33101f
223 changed files with 1601 additions and 906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/render/intern/source/pipeline.c
View File

@@ -2175,14 +2175,6 @@ void RE_BlenderFrame(Render *re, Main *bmain, Scene *scene, SceneRenderLayer *sr
G.is_rendering = FALSE;
}
static void colormanage_image_for_write(Scene *scene, ImBuf *ibuf)
{
IMB_display_buffer_to_imbuf_rect(ibuf, &scene->view_settings, &scene->display_settings);
if (ibuf)
imb_freerectfloatImBuf(ibuf);
}
void RE_RenderFreestyleStrokes(Render *re, Main *bmain, Scene *scene)
{
re->result_ok= 0;
@@ -2213,7 +2205,9 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
do_free = TRUE;
}
colormanage_image_for_write(scene, ibuf);
IMB_colormanagement_imbuf_for_write(ibuf, TRUE, FALSE, &scene->view_settings,
&scene->display_settings, &scene->r.im_format);
ok = mh->append_movie(&re->r, scene->r.sfra, scene->r.cfra, (int *) ibuf->rect,
ibuf->x, ibuf->y, re->reports);
@@ -2241,12 +2235,9 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
}
else {
ImBuf *ibuf = render_result_rect_to_ibuf(&rres, &scene->r);
int do_colormanagement;
do_colormanagement = !BKE_imtype_supports_float(scene->r.im_format.imtype);
if (do_colormanagement)
colormanage_image_for_write(scene, ibuf);
IMB_colormanagement_imbuf_for_write(ibuf, TRUE, FALSE, &scene->view_settings,
&scene->display_settings, &scene->r.im_format);
ok = BKE_imbuf_write_stamp(scene, camera, ibuf, name, &scene->r.im_format);
@@ -2265,7 +2256,8 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
BKE_add_image_extension(name, R_IMF_IMTYPE_JPEG90);
ibuf->planes = 24;
colormanage_image_for_write(scene, ibuf);
IMB_colormanagement_imbuf_for_write(ibuf, TRUE, FALSE, &scene->view_settings,
&scene->display_settings, &imf);
BKE_imbuf_write_stamp(scene, camera, ibuf, name, &imf);
printf("\nSaved: %s", name);
@@ -2611,7 +2603,7 @@ int RE_WriteEnvmapResult(struct ReportList *reports, Scene *scene, EnvMap *env,
return 0;
}
IMB_display_buffer_to_imbuf_rect(ibuf, &scene->view_settings, &scene->display_settings);
IMB_colormanagement_imbuf_for_write(ibuf, TRUE, FALSE, &scene->view_settings, &scene->display_settings, &imf);
/* to save, we first get absolute path */
BLI_strncpy(filepath, relpath, sizeof(filepath));