Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-04-14 11:45:09 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-04-14 11:48:20 +0400
commit0d38f21cbc004a2aa8b4a944aaf068d83e75a197 (patch)
treebd31c2e765e962acb0071bf8b964fa19e4c1b660 /source/blender/editors/include/ED_image.h
parentf24bfcffefa0eca74dbfb26f1e331c3f7a7da85e (diff)
Fix the eyedropper not working properly with different scene linear spaces
Either was some residue from the past or somebody didn't implement this in the right way. Also fixed memory leak in ED_space_clip_color_sample() caused by missing image buffer release.
Diffstat (limited to 'source/blender/editors/include/ED_image.h')
-rw-r--r--source/blender/editors/include/ED_image.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index adb147d4ff0..b15a83809f5 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -47,7 +47,7 @@ void ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, s
struct Mask *ED_space_image_get_mask(struct SpaceImage *sima);
void ED_space_image_set_mask(struct bContext *C, struct SpaceImage *sima, struct Mask *mask);
-bool ED_space_image_color_sample(struct SpaceImage *sima, struct ARegion *ar, int mval[2], float r_col[3]);
+bool ED_space_image_color_sample(struct Scene *scene, struct SpaceImage *sima, struct ARegion *ar, int mval[2], float r_col[3]);
struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **lock_r);
void ED_space_image_release_buffer(struct SpaceImage *sima, struct ImBuf *ibuf, void *lock);
bool ED_space_image_has_buffer(struct SpaceImage *sima);