diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
| commit | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (patch) | |
| tree | 81a2b9221799707b49b74a5df8bb3ff964ba78bd /source/blender/editors/include/ED_image.h | |
| parent | 7afbdff1b6c348227e652e1c3071ab7ba7c91c44 (diff) | |
| parent | a73dd3476e7d180d3320afc04d218ce22f2f3bfc (diff) | |
Merged changes in the trunk up to revision 50829.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
Diffstat (limited to 'source/blender/editors/include/ED_image.h')
| -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 87f12b8ac9c..a50b33966c6 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -39,6 +39,7 @@ struct ToolSettings; struct uiBlock; struct wmWindowManager; struct ARegion; +struct Scene; /* image_edit.c, exported for transform */ struct Image *ED_space_image(struct SpaceImage *sima); @@ -77,7 +78,7 @@ int ED_space_image_maskedit_mask_poll(struct bContext *C); /* UI level image (texture) updating... render calls own stuff (too) */ void ED_image_update_frame(const struct Main *mainp, int cfra); -void ED_image_draw_info(struct ARegion *ar, int color_manage, int channels, int x, int y, +void ED_image_draw_info(struct Scene *scene, struct ARegion *ar, int color_manage, int use_default_view, int channels, int x, int y, const unsigned char cp[4], const float fp[4], int *zp, float *zpf); #endif /* __ED_IMAGE_H__ */ |