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

Partial fix for issues in [#20564] Color Management/Linear Workflow not taken into

Browse Source 
account in Preview Render anymore?
This commit is contained in:
Matt Ebb
2010-01-19 02:47:44 +00:00
parent 2fa3baf30b
commit b34a0fd18a
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/blenloader/intern/readfile.c
View File

@@ -10136,7 +10136,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
Scene *sce=main->scene.first;
Material *ma=main->mat.first;
World *wo=main->world.first;
int convert=0;
Tex *tex=main->tex.first;
int i, convert=0;
/* convert to new color management system:
while previously colors were stored as srgb,
@@ -10152,6 +10153,21 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if (convert) {
while(ma) {
if (ma->ramp_col) {
ColorBand *band = (ColorBand *)ma->ramp_col;
for (i=0; i<band->tot; i++) {
CBData *data = band->data + i;
srgb_to_linearrgb_v3_v3(&data->r, &data->r);
}
}
if (ma->ramp_spec) {
ColorBand *band = (ColorBand *)ma->ramp_spec;
for (i=0; i<band->tot; i++) {
CBData *data = band->data + i;
srgb_to_linearrgb_v3_v3(&data->r, &data->r);
}
}
srgb_to_linearrgb_v3_v3(&ma->r, &ma->r);
srgb_to_linearrgb_v3_v3(&ma->specr, &ma->specr);
srgb_to_linearrgb_v3_v3(&ma->mirr, &ma->mirr);
@@ -10159,6 +10175,17 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
ma=ma->id.next;
}
while(tex) {
if (tex->coba) {
ColorBand *band = (ColorBand *)tex->coba;
for (i=0; i<band->tot; i++) {
CBData *data = band->data + i;
srgb_to_linearrgb_v3_v3(&data->r, &data->r);
}
}
tex=tex->id.next;
}
while(wo) {
srgb_to_linearrgb_v3_v3(&wo->ambr, &wo->ambr);
srgb_to_linearrgb_v3_v3(&wo->horr, &wo->horr);