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

Bugfix #26388

Browse Source 
Actually a todo item I forgot:

Material nodes previews now follow the scene "color managenent"
setting.
This commit is contained in:
Ton Roosendaal
2011-03-07 11:51:09 +00:00
parent c544d3ffb8
commit daff7a447e
8 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/node.c
View File

@@ -1325,7 +1325,7 @@ void ntreeClearPreview(bNodeTree *ntree)
/* hack warning! this function is only used for shader previews, and
since it gets called multiple times per pixel for Ztransp we only
add the color once. Preview gets cleared before it starts render though */
void nodeAddToPreview(bNode *node, float *col, int x, int y)
void nodeAddToPreview(bNode *node, float *col, int x, int y, int do_manage)
{
bNodePreview *preview= node->preview;
if(preview) {
@@ -1333,7 +1333,7 @@ void nodeAddToPreview(bNode *node, float *col, int x, int y)
if(x<preview->xsize && y<preview->ysize) {
unsigned char *tar= preview->rect+ 4*((preview->xsize*y) + x);
if(TRUE) {
if(do_manage) {
tar[0]= FTOCHAR(linearrgb_to_srgb(col[0]));
tar[1]= FTOCHAR(linearrgb_to_srgb(col[1]));
tar[2]= FTOCHAR(linearrgb_to_srgb(col[2]));