diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-16 18:47:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-16 18:47:14 +0400 |
commit | 81dd80f1d3da6db3227abafe431ac0e92c4e7197 (patch) | |
tree | 6130beb4db65bb8bf7bc5872ce565d4de9e45e16 /source/blender/editors/include | |
parent | 6fb4bbdbd963eb0f9626d6bd784b22c65bd5cd44 (diff) |
support fro HDR color picking (values over 1.0) when color picking in the image editor or node space.
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_image.h | 1 | ||||
-rw-r--r-- | source/blender/editors/include/ED_node.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index d291c500547..6f41bef81f4 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -46,6 +46,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); +int 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 **lock_r); void ED_space_image_release_buffer(struct SpaceImage *sima, void *lock); int ED_space_image_has_buffer(struct SpaceImage *sima); diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h index b6a1fd0f979..32baa8883e1 100644 --- a/source/blender/editors/include/ED_node.h +++ b/source/blender/editors/include/ED_node.h @@ -76,8 +76,11 @@ void ED_node_set_active(struct Main *bmain, struct bNodeTree *ntree, struct bNod void ED_node_composite_job(const bContext *C, struct bNodeTree *nodetree, struct Scene *scene_owner); -/* node ops.c */ +/* node_ops.c */ void ED_operatormacros_node(void); +/* node_view.c */ +int ED_space_node_color_sample(struct SpaceNode *snode, struct ARegion *ar, int mval[2], float r_col[3]); + #endif /* __ED_NODE_H__ */ |