diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
| commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
| tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /source/blender/imbuf/IMB_colormanagement.h | |
| parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
| parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) | |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'source/blender/imbuf/IMB_colormanagement.h')
| -rw-r--r-- | source/blender/imbuf/IMB_colormanagement.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index 8af86389db3..09cdb3a4ee9 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -191,11 +191,6 @@ bool IMB_colormanagement_setup_glsl_draw_from_space_ctx(const struct bContext *C /* Finish GLSL-based display space conversion */ void IMB_colormanagement_finish_glsl_draw(void); -/* Configures GLSL shader for conversion from space defined by role to scene linear space */ -bool IMB_colormanagement_setup_transform_from_role_glsl(int role, bool predivide); -/* Finish GLSL-based color space conversion */ -void IMB_colormanagement_finish_glsl_transform(void); - /* Roles */ enum { COLOR_ROLE_SCENE_LINEAR = 0, |