diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-21 10:14:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-21 10:14:13 +0300 |
| commit | 2b9738b7f814a7c5cae02d283d0958a2a0284cb5 (patch) | |
| tree | c3902e3a9d865c983630229b98cd14c0275c6763 /source/blender/editors/include/ED_image.h | |
| parent | c4780ee45927b25d6bb186261b3fab75c7214471 (diff) | |
| parent | 13ee5ba467d69b80f025d0d2542ed190ad1667db (diff) | |
Merge branch 'master' into 28
Diffstat (limited to 'source/blender/editors/include/ED_image.h')
| -rw-r--r-- | source/blender/editors/include/ED_image.h | 2 |
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 26d456b03d6..00e58785373 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 Scene *scene, struct SpaceImage *sima, struct ARegion *ar, int mval[2], float r_col[3]); +bool ED_space_image_color_sample(struct SpaceImage *sima, struct ARegion *ar, int mval[2], float r_col[3]); struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **r_lock); void ED_space_image_release_buffer(struct SpaceImage *sima, struct ImBuf *ibuf, void *lock); bool ED_space_image_has_buffer(struct SpaceImage *sima); |