diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-11-12 11:14:36 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-11-12 11:14:36 +0300 |
| commit | 08452d995664f6e5605d282374746c305f28fa52 (patch) | |
| tree | bae7ed9420d0ff051db866f326f92721f7184f5c /source/blender/editors/include | |
| parent | cd2dfacfa574f99acb06c0d020d96b2be714aa20 (diff) | |
| parent | c08827e659e5f48034b4f9d4612bd309ea63ff03 (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_image.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index 01040949a0a..4835d2118d9 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -58,7 +58,8 @@ void ED_space_image_set_mask(struct bContext *C, struct SpaceImage *sima, struct bool ED_space_image_color_sample(struct SpaceImage *sima, struct ARegion *region, int mval[2], - float r_col[3]); + float r_col[3], + bool *r_is_data); struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **r_lock, int tile); int ED_space_image_get_display_channel_mask(struct ImBuf *ibuf); void ED_space_image_release_buffer(struct SpaceImage *sima, struct ImBuf *ibuf, void *lock); |