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

Color management: some parts of previous commit were incorrect merged from WIP patch

Browse Source
This commit is contained in:
Sergey Sharybin
2012-08-29 18:11:51 +00:00
parent 2e1568d64e
commit 63197444b4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/imbuf/intern/colormanagement.c
View File

@@ -1401,8 +1401,7 @@ static void colormanage_check_display_settings(ColorManagedDisplaySettings *disp
}
}
static void colormanage_check_view_settings(ColorManagedViewSettings *view_settings, const char *what,
const ColorManagedView *default_view)
static void colormanage_check_view_settings(ColorManagedDisplaySettings *display_settings, ColorManagedViewSettings *view_settings, const char *what)
{
ColorManagedDisplay *display;
ColorManagedView *default_view;
@@ -1478,7 +1477,7 @@ void IMB_colormanagement_check_file_config(Main *bmain)
for (scene = bmain->scene.first; scene; scene = scene->id.next) {
colormanage_check_display_settings(&scene->display_settings, "scene", default_display);
colormanage_check_view_settings(&scene->display_settings, &scene->view_settings, "scene", default_view);
colormanage_check_view_settings(&scene->display_settings, &scene->view_settings, "scene");
}
/* ** check input color space settings ** */