After testing and feedback, I've decided to slightly modify the way color management works internally. While the previous method worked well for rendering, was a smaller transition and had some advantages over this new method, it was a bit more ambiguous, and was making things difficult for other areas such as compositing. This implementation now considers all color data (with only a couple of exceptions such as brush colors) to be stored in linear RGB color space, rather than sRGB as previously. This brings it in line with Nuke, which also operates this way, quite successfully. Color swatches, pickers, color ramp display are now gamma corrected to display gamma so you can see what you're doing, but the numbers themselves are considered linear. This makes understanding blending modes more clear (a 0.5 value on overlay will not change the result now) as well as making color swatches act more predictably in the compositor, however bringing over color values from applications like photoshop or gimp, that operate in a gamma space, will give identical results. This commit will convert over existing files saved by earlier 2.5 versions to work generally the same, though there may be some slight differences with things like textures. Now that we're set on changing other areas of shading, this won't be too disruptive overall. I've made a diagram explaining the pipeline here: http://mke3.net/blender/devel/2.5/25_linear_workflow_pipeline.png and some docs here: http://www.blender.org/development/release-logs/blender-250/color-management/
196 lines
5.7 KiB
C
196 lines
5.7 KiB
C
/**
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2009 Blender Foundation.
|
|
* All rights reserved.
|
|
*
|
|
* Contributor(s): Blender Foundation
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "DNA_object_types.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_utildefines.h"
|
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "UI_interface.h"
|
|
#include "UI_resources.h"
|
|
|
|
#include "WM_api.h"
|
|
#include "WM_types.h"
|
|
|
|
/*************************** RNA Utilities ******************************/
|
|
|
|
uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int index, char *name, int icon, int x1, int y1, int x2, int y2)
|
|
{
|
|
uiBut *but=NULL;
|
|
const char *propname= RNA_property_identifier(prop);
|
|
char prop_item[sizeof(((IDProperty *)NULL)->name)+4]; /* size of the ID prop name + room for [""] */
|
|
int arraylen= RNA_property_array_length(ptr, prop);
|
|
|
|
/* support for custom props */
|
|
if(RNA_property_is_idprop(prop)) {
|
|
sprintf(prop_item, "[\"%s\"]", propname);
|
|
propname= prop_item;
|
|
}
|
|
|
|
switch(RNA_property_type(prop)) {
|
|
case PROP_BOOLEAN: {
|
|
int value, length;
|
|
|
|
if(arraylen && index == -1)
|
|
return NULL;
|
|
|
|
length= RNA_property_array_length(ptr, prop);
|
|
|
|
if(length)
|
|
value= RNA_property_boolean_get_index(ptr, prop, index);
|
|
else
|
|
value= RNA_property_boolean_get(ptr, prop);
|
|
|
|
if(icon && name && strcmp(name, "") == 0)
|
|
but= uiDefIconButR(block, ICONTOG, 0, icon, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
else if(icon)
|
|
but= uiDefIconTextButR(block, ICONTOG, 0, icon, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
else
|
|
but= uiDefButR(block, OPTION, 0, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
break;
|
|
}
|
|
case PROP_INT:
|
|
case PROP_FLOAT:
|
|
if(arraylen && index == -1) {
|
|
if(ELEM(RNA_property_subtype(prop), PROP_COLOR, PROP_COLOR_GAMMA))
|
|
but= uiDefButR(block, COL, 0, name, x1, y1, x2, y2, ptr, propname, 0, 0, 0, -1, -1, NULL);
|
|
}
|
|
else if(RNA_property_subtype(prop) == PROP_PERCENTAGE || RNA_property_subtype(prop) == PROP_FACTOR)
|
|
but= uiDefButR(block, NUMSLI, 0, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
else
|
|
but= uiDefButR(block, NUM, 0, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
break;
|
|
case PROP_ENUM:
|
|
if(icon && name && strcmp(name, "") == 0)
|
|
but= uiDefIconButR(block, MENU, 0, icon, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
else if(icon)
|
|
but= uiDefIconTextButR(block, MENU, 0, icon, NULL, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
else
|
|
but= uiDefButR(block, MENU, 0, NULL, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
break;
|
|
case PROP_STRING:
|
|
if(icon && name && strcmp(name, "") == 0)
|
|
but= uiDefIconButR(block, TEX, 0, icon, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
else if(icon)
|
|
but= uiDefIconTextButR(block, TEX, 0, icon, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
else
|
|
but= uiDefButR(block, TEX, 0, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
break;
|
|
case PROP_POINTER: {
|
|
PointerRNA pptr;
|
|
int icon;
|
|
|
|
pptr= RNA_property_pointer_get(ptr, prop);
|
|
if(!pptr.type)
|
|
pptr.type= RNA_property_pointer_type(ptr, prop);
|
|
icon= RNA_struct_ui_icon(pptr.type);
|
|
if(icon == ICON_DOT)
|
|
icon= 0;
|
|
|
|
but= uiDefIconTextButR(block, IDPOIN, 0, icon, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL);
|
|
break;
|
|
}
|
|
case PROP_COLLECTION: {
|
|
char text[256];
|
|
sprintf(text, "%d items", RNA_property_collection_length(ptr, prop));
|
|
but= uiDefBut(block, LABEL, 0, text, x1, y1, x2, y2, NULL, 0, 0, 0, 0, NULL);
|
|
uiButSetFlag(but, UI_BUT_DISABLED);
|
|
break;
|
|
}
|
|
default:
|
|
but= NULL;
|
|
break;
|
|
}
|
|
|
|
return but;
|
|
}
|
|
|
|
void uiDefAutoButsRNA(const bContext *C, uiLayout *layout, PointerRNA *ptr, int columns)
|
|
{
|
|
uiLayout *split, *col;
|
|
int flag;
|
|
char *name;
|
|
|
|
RNA_STRUCT_BEGIN(ptr, prop) {
|
|
flag= RNA_property_flag(prop);
|
|
if(flag & PROP_HIDDEN)
|
|
continue;
|
|
|
|
name= (char*)RNA_property_ui_name(prop);
|
|
|
|
if(columns == 1) {
|
|
col= uiLayoutColumn(layout, 1);
|
|
uiItemL(col, name, 0);
|
|
}
|
|
else if(columns == 2) {
|
|
split = uiLayoutSplit(layout, 0.5f);
|
|
|
|
uiItemL(uiLayoutColumn(split, 0), name, 0);
|
|
col= uiLayoutColumn(split, 0);
|
|
}
|
|
else
|
|
col= NULL;
|
|
|
|
uiItemFullR(col, "", 0, ptr, prop, -1, 0, 0);
|
|
}
|
|
RNA_STRUCT_END;
|
|
}
|
|
|
|
/***************************** ID Utilities *******************************/
|
|
|
|
int uiIconFromID(ID *id)
|
|
{
|
|
Object *ob;
|
|
PointerRNA ptr;
|
|
short idcode;
|
|
|
|
if(id==NULL)
|
|
return 0;
|
|
|
|
idcode= GS(id->name);
|
|
|
|
/* exception for objects */
|
|
if(idcode == ID_OB) {
|
|
ob= (Object*)id;
|
|
|
|
if(ob->type == OB_EMPTY)
|
|
return ICON_EMPTY_DATA;
|
|
else
|
|
return uiIconFromID(ob->data);
|
|
}
|
|
|
|
/* otherwise get it through RNA, creating the pointer
|
|
will set the right type, also with subclassing */
|
|
RNA_id_pointer_create(id, &ptr);
|
|
|
|
return (ptr.type)? RNA_struct_ui_icon(ptr.type): 0;
|
|
}
|