[Bf-blender-cvs] [6f03051] cycles-ptex-49: Revert "Code cleanup: remove unused function BKE_image_assign_ibuf"
Nicholas Bishop
noreply at git.blender.org
Tue Feb 10 18:38:32 CET 2015
Commit: 6f03051fac4cc3f390976c98ea8ea20b7d1d9e5f
Author: Nicholas Bishop
Date: Tue Feb 10 17:34:29 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB6f03051fac4cc3f390976c98ea8ea20b7d1d9e5f
Revert "Code cleanup: remove unused function BKE_image_assign_ibuf"
This reverts commit 567e147f619b1a51eecebccaaff39030362fd2f4.
===================================================================
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 2c9ecef..945224f 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -186,6 +186,9 @@ void BKE_image_walk_all_users(const struct Main *mainp, void *customdata,
/* ensures an Image exists for viewing nodes or render */
struct Image *BKE_image_verify_viewer(int type, const char *name);
+/* force an ImBuf to become part of Image */
+void BKE_image_assign_ibuf(struct Image *ima, struct ImBuf *ibuf);
+
/* called on frame change or before render */
void BKE_image_user_frame_calc(struct ImageUser *iuser, int cfra, int fieldnr);
void BKE_image_user_check_frame_calc(struct ImageUser *iuser, int cfra, int fieldnr);
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 131a19b..85a0532f 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2182,6 +2182,11 @@ Image *BKE_image_verify_viewer(int type, const char *name)
return ima;
}
+void BKE_image_assign_ibuf(Image *ima, ImBuf *ibuf)
+{
+ image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
+}
+
void BKE_image_walk_all_users(const Main *mainp, void *customdata,
void callback(Image *ima, ImageUser *iuser, void *customdata))
{
More information about the Bf-blender-cvs
mailing list