diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-30 16:37:41 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-30 16:37:41 +0400 |
commit | 6bfe9266be22a087e56efaccca9b52aa553b7530 (patch) | |
tree | a48a9510c6b57139fc1d1a68734352fd7e0cfc01 /source/blender/editors/space_node/drawnode.c | |
parent | b57a5521c4a6b1f27fdb2a122b2b31f4f7308950 (diff) |
Color management cleanup and improvements
- De-duplicate code used by color management panel drawing,
moved this panel to utility file in bl_ui
- Added support of per-window color management control
which means view transform. exposure and gamma could be
set per window and all spaces would use this settings.
This is default behavior for older files now.
- Added support of color management display of movie clips
in clip editor.
Supported both texture buffer and fallback draw methods.
- Fixed default values for exposure and gamma
Diffstat (limited to 'source/blender/editors/space_node/drawnode.c')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 90f379e6f44..3af688dfca7 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -2962,6 +2962,7 @@ void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode) if (ibuf) { SpaceNode *snode = CTX_wm_space_node(C); wmWindow *win = CTX_wm_window(C); + const ColorManagedViewSettings *view_settings; float x, y; unsigned char *display_buffer; void *cache_handle; @@ -2984,8 +2985,8 @@ void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode) y = (ar->winy - snode->zoom * ibuf->y) / 2 + snode->yof; - display_buffer = IMB_display_buffer_acquire(ibuf, &snode->view_settings, - win->display_device, &cache_handle); + view_settings = IMB_view_settings_get_effective(win, &snode->view_settings); + display_buffer = IMB_display_buffer_acquire(ibuf, view_settings, win->display_device, &cache_handle); if (display_buffer) { if (snode->flag & SNODE_SHOW_ALPHA) { |