[Bf-blender-cvs] [07d13be678c] master: Cleanup: rename 'verify' to 'ensure' for BKE_image_viewer functions
Campbell Barton
noreply at git.blender.org
Fri Mar 6 03:07:10 CET 2020
Commit: 07d13be678c6b8d5c5c793f664668831ac265f9e
Author: Campbell Barton
Date: Fri Mar 6 13:02:59 2020 +1100
Branches: master
https://developer.blender.org/rB07d13be678c6b8d5c5c793f664668831ac265f9e
Cleanup: rename 'verify' to 'ensure' for BKE_image_viewer functions
===================================================================
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/intern/image.c
M source/blender/compositor/operations/COM_CompositorOperation.cpp
M source/blender/compositor/operations/COM_ViewerOperation.cpp
M source/blender/editors/render/render_internal.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_view.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_node/node_gizmo.c
M source/blender/editors/space_node/node_view.c
M source/blender/nodes/composite/nodes/node_composite_splitViewer.c
M source/blender/nodes/composite/nodes/node_composite_viewer.c
M source/blender/windowmanager/intern/wm_draw.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 81d8e20bf5e..7ae01484d6f 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -226,9 +226,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(struct Main *bmain, int type, const char *name);
+struct Image *BKE_image_ensure_viewer(struct Main *bmain, int type, const char *name);
/* ensures the view node cache is compatible with the scene views */
-void BKE_image_verify_viewer_views(const struct RenderData *rd,
+void BKE_image_ensure_viewer_views(const struct RenderData *rd,
struct Image *ima,
struct ImageUser *iuser);
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index d54d9a03524..76596e67718 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2985,7 +2985,7 @@ struct anim *openanim(const char *name, int flags, int streamindex, char colorsp
/* forces existence of 1 Image for renderout or nodes, returns Image */
/* name is only for default, when making new one */
-Image *BKE_image_verify_viewer(Main *bmain, int type, const char *name)
+Image *BKE_image_ensure_viewer(Main *bmain, int type, const char *name)
{
Image *ima;
@@ -3026,7 +3026,7 @@ static void image_viewer_create_views(const RenderData *rd, Image *ima)
}
/* Reset the image cache and views when the Viewer Nodes views don't match the scene views */
-void BKE_image_verify_viewer_views(const RenderData *rd, Image *ima, ImageUser *iuser)
+void BKE_image_ensure_viewer_views(const RenderData *rd, Image *ima, ImageUser *iuser)
{
bool do_reset;
const bool is_multiview = (rd->scemode & R_MULTIVIEW) != 0;
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp
index ff9fc7dbcbc..20ea7009105 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.cpp
+++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp
@@ -111,7 +111,7 @@ void CompositorOperation::deinitExecution()
BLI_thread_lock(LOCK_DRAW_IMAGE);
BKE_image_signal(G.main,
- BKE_image_verify_viewer(G.main, IMA_TYPE_R_RESULT, "Render Result"),
+ BKE_image_ensure_viewer(G.main, IMA_TYPE_R_RESULT, "Render Result"),
NULL,
IMA_SIGNAL_FREE);
BLI_thread_unlock(LOCK_DRAW_IMAGE);
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp
index 50b508dafb1..96c6320ff01 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.cpp
+++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp
@@ -129,7 +129,7 @@ void ViewerOperation::initImage()
/* make sure the image has the correct number of views */
if (ima && BKE_scene_multiview_is_render_view_first(this->m_rd, this->m_viewName)) {
- BKE_image_verify_viewer_views(this->m_rd, ima, this->m_imageUser);
+ BKE_image_ensure_viewer_views(this->m_rd, ima, this->m_imageUser);
}
BLI_thread_lock(LOCK_DRAW_IMAGE);
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index c2b2d36d91c..f37d2cf9a76 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -337,7 +337,7 @@ static int screen_render_exec(bContext *C, wmOperator *op)
RE_draw_lock_cb(re, NULL, NULL);
RE_test_break_cb(re, NULL, render_break);
- ima = BKE_image_verify_viewer(mainp, IMA_TYPE_R_RESULT, "Render Result");
+ ima = BKE_image_ensure_viewer(mainp, IMA_TYPE_R_RESULT, "Render Result");
BKE_image_signal(mainp, ima, NULL, IMA_SIGNAL_FREE);
BKE_image_backup_render(scene, ima, true);
@@ -1049,7 +1049,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
}
/* get a render result image, and make sure it is empty */
- ima = BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
+ ima = BKE_image_ensure_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
BKE_image_signal(rj->main, ima, NULL, IMA_SIGNAL_FREE);
BKE_image_backup_render(rj->scene, ima, true);
rj->image = ima;
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index be9c433fc83..f212eb07e2e 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -825,7 +825,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
oglrender->re = RE_NewSceneRender(scene);
/* create image and image user */
- oglrender->ima = BKE_image_verify_viewer(oglrender->bmain, IMA_TYPE_R_RESULT, "Render Result");
+ oglrender->ima = BKE_image_ensure_viewer(oglrender->bmain, IMA_TYPE_R_RESULT, "Render Result");
BKE_image_signal(oglrender->bmain, oglrender->ima, NULL, IMA_SIGNAL_FREE);
BKE_image_backup_render(oglrender->scene, oglrender->ima, true);
diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c
index 9849be2a57b..1aa0c0ab37d 100644
--- a/source/blender/editors/render/render_view.c
+++ b/source/blender/editors/render/render_view.c
@@ -230,7 +230,7 @@ ScrArea *render_view_open(bContext *C, int mx, int my, ReportList *reports)
sima->link_flag |= SPACE_FLAG_TYPE_TEMPORARY;
/* get the correct image, and scale it */
- sima->image = BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
+ sima->image = BKE_image_ensure_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
/* If we're rendering to full screen, set appropriate hints on image editor
* so it can restore properly on pressing escape. */
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index e115c10a15a..35985bec5e7 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -3931,7 +3931,7 @@ static int image_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op))
SpaceImage *sima = CTX_wm_space_image(C);
Image *ima;
- ima = BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
+ ima = BKE_image_ensure_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
if (sima->image == NULL) {
ED_space_image_set(bmain, sima, NULL, ima, false);
}
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 7ba033432c0..6d37d0d1b7e 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -3485,7 +3485,7 @@ void draw_nodespace_back_pix(const bContext *C,
return;
}
- ima = BKE_image_verify_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
+ ima = BKE_image_ensure_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
if (ibuf) {
float x, y;
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 21e68c0b600..a690aa75e3c 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -320,7 +320,7 @@ void ED_node_composite_job(const bContext *C, struct bNodeTree *nodetree, Scene
#endif
BKE_image_backup_render(
- scene, BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result"), false);
+ scene, BKE_image_ensure_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result"), false);
wm_job = WM_jobs_get(CTX_wm_manager(C),
CTX_wm_window(C),
@@ -727,7 +727,7 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
}
/* addnode() doesn't link this yet... */
- node->id = (ID *)BKE_image_verify_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
+ node->id = (ID *)BKE_image_ensure_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
}
else if (node->type == CMP_NODE_COMPOSITE) {
if (was_output == 0) {
@@ -2624,7 +2624,7 @@ static int viewer_border_exec(bContext *C, wmOperator *op)
ED_preview_kill_jobs(CTX_wm_manager(C), bmain);
- ima = BKE_image_verify_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
+ ima = BKE_image_ensure_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
if (ibuf) {
diff --git a/source/blender/editors/space_node/node_gizmo.c b/source/blender/editors/space_node/node_gizmo.c
index 76e8b5ca7df..ad959570acd 100644
--- a/source/blender/editors/space_node/node_gizmo.c
+++ b/source/blender/editors/space_node/node_gizmo.c
@@ -143,7 +143,7 @@ static void WIDGETGROUP_node_transform_refresh(const bContext *C, wmGizmoGroup *
const float origin[3] = {ar->winx / 2, ar->winy / 2};
void *lock;
- Image *ima = BKE_image_verify_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
+ Image *ima = BKE_image_ensure_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
if (ibuf) {
@@ -367,7 +367,7 @@ static void WIDGETGROUP_node_crop_refresh(const bContext *C, wmGizmoGroup *gzgro
wmGizmo *gz = crop_group->border;
void *lock;
- Image *ima = BKE_image_verify_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
+ Image *ima = BKE_image_ensure_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
if (ibuf) {
@@ -483,7 +483,7 @@ static void WIDGETGROUP_node_sbeam_refresh(const bContext *C, wmGizmoGroup *gzgr
wmGizmo *gz = sbeam_group->gizmo;
void *lock;
- Image *ima = BKE_image_verify_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
+ Image *ima = BKE_image_ensure_viewer(bmain, IMA_TYPE_COMPOSITE, "Viewer Node");
ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, &lock);
if (ibuf) {
@@ -594,7 +594,7 @@ st
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list