[Bf-blender-cvs] [7cb55a79d82] master: Cleanup: use boolean arguments
Campbell Barton
noreply at git.blender.org
Fri Feb 26 07:00:34 CET 2021
Commit: 7cb55a79d82d3e2e9d330368492210b17f6e1eac
Author: Campbell Barton
Date: Fri Feb 26 16:50:36 2021 +1100
Branches: master
https://developer.blender.org/rB7cb55a79d82d3e2e9d330368492210b17f6e1eac
Cleanup: use boolean arguments
===================================================================
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_screen.h
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/screen.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/render/render_internal.c
M source/blender/render/RE_pipeline.h
M source/blender/render/intern/engine.c
M source/blender/render/intern/pipeline.c
M source/blender/render/intern/render_types.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 76d5eb945bb..d675df6d868 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -777,7 +777,7 @@ void BKE_node_preview_free(struct bNodePreview *preview);
void BKE_node_preview_init_tree(struct bNodeTree *ntree,
int xsize,
int ysize,
- int create_previews);
+ bool create_previews);
void BKE_node_preview_free_tree(struct bNodeTree *ntree);
void BKE_node_preview_remove_unused(struct bNodeTree *ntree);
void BKE_node_preview_clear(struct bNodePreview *preview);
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 32c888b058f..085851ba5e6 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -404,7 +404,7 @@ void BKE_spacetypes_free(void); /* only for quitting blender */
/* spacedata */
void BKE_spacedata_freelist(ListBase *lb);
void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2);
-void BKE_spacedata_draw_locks(int set);
+void BKE_spacedata_draw_locks(bool set);
struct ARegion *BKE_spacedata_find_region_type(const struct SpaceLink *slink,
const struct ScrArea *area,
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 58003c03f8c..7bd7fb4a29b 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -2501,7 +2501,7 @@ static void node_preview_init_tree_recursive(bNodeInstanceHash *previews,
bNodeInstanceKey parent_key,
int xsize,
int ysize,
- int create)
+ bool create_previews)
{
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
bNodeInstanceKey key = BKE_node_instance_key(parent_key, ntree, node);
@@ -2510,16 +2510,17 @@ static void node_preview_init_tree_recursive(bNodeInstanceHash *previews,
node->preview_xsize = xsize;
node->preview_ysize = ysize;
- BKE_node_preview_verify(previews, key, xsize, ysize, create);
+ BKE_node_preview_verify(previews, key, xsize, ysize, create_previews);
}
if (node->type == NODE_GROUP && node->id) {
- node_preview_init_tree_recursive(previews, (bNodeTree *)node->id, key, xsize, ysize, create);
+ node_preview_init_tree_recursive(
+ previews, (bNodeTree *)node->id, key, xsize, ysize, create_previews);
}
}
}
-void BKE_node_preview_init_tree(bNodeTree *ntree, int xsize, int ysize, int create_previews)
+void BKE_node_preview_init_tree(bNodeTree *ntree, int xsize, int ysize, bool create_previews)
{
if (!ntree) {
return;
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 07619466bc5..8b911143668 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -533,7 +533,7 @@ void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2)
/* facility to set locks for drawing to survive (render) threads accessing drawing data */
/* lock can become bitflag too */
/* should be replaced in future by better local data handling for threads */
-void BKE_spacedata_draw_locks(int set)
+void BKE_spacedata_draw_locks(bool set)
{
LISTBASE_FOREACH (SpaceType *, st, &spacetypes) {
LISTBASE_FOREACH (ARegionType *, art, &st->regiontypes) {
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index d0ebac82c90..1ee17d0e4b0 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -302,7 +302,7 @@ static void pe_update_hair_particle_edit_pointers(PTCacheEdit *edit)
*
* note: this function runs on poll, therefore it can runs many times a second
* keep it fast! */
-static PTCacheEdit *pe_get_current(Depsgraph *depsgraph, Scene *scene, Object *ob, int create)
+static PTCacheEdit *pe_get_current(Depsgraph *depsgraph, Scene *scene, Object *ob, bool create)
{
ParticleEditSettings *pset = PE_settings(scene);
PTCacheEdit *edit = NULL;
@@ -406,12 +406,12 @@ static PTCacheEdit *pe_get_current(Depsgraph *depsgraph, Scene *scene, Object *o
PTCacheEdit *PE_get_current(Depsgraph *depsgraph, Scene *scene, Object *ob)
{
- return pe_get_current(depsgraph, scene, ob, 0);
+ return pe_get_current(depsgraph, scene, ob, false);
}
PTCacheEdit *PE_create_current(Depsgraph *depsgraph, Scene *scene, Object *ob)
{
- return pe_get_current(depsgraph, scene, ob, 1);
+ return pe_get_current(depsgraph, scene, ob, true);
}
void PE_current_changed(Depsgraph *depsgraph, Scene *scene, Object *ob)
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 50ba5907703..b525d8a373e 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -800,7 +800,7 @@ static int render_break(void *UNUSED(rjv))
/* runs in thread, no cursor setting here works. careful with notifiers too (malloc conflicts) */
/* maybe need a way to get job send notifier? */
-static void render_drawlock(void *rjv, int lock)
+static void render_drawlock(void *rjv, bool lock)
{
RenderJob *rj = rjv;
diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h
index 688709d55f3..27dcd9e70ed 100644
--- a/source/blender/render/RE_pipeline.h
+++ b/source/blender/render/RE_pipeline.h
@@ -331,7 +331,7 @@ void RE_display_update_cb(struct Render *re,
void (*f)(void *handle, RenderResult *rr, volatile struct rcti *rect));
void RE_stats_draw_cb(struct Render *re, void *handle, void (*f)(void *handle, RenderStats *rs));
void RE_progress_cb(struct Render *re, void *handle, void (*f)(void *handle, float));
-void RE_draw_lock_cb(struct Render *re, void *handle, void (*f)(void *handle, int));
+void RE_draw_lock_cb(struct Render *re, void *handle, void (*f)(void *handle, bool lock));
void RE_test_break_cb(struct Render *re, void *handle, int (*f)(void *handle));
void RE_current_scene_update_cb(struct Render *re,
void *handle,
diff --git a/source/blender/render/intern/engine.c b/source/blender/render/intern/engine.c
index b199b1b0743..a43a78f5d3d 100644
--- a/source/blender/render/intern/engine.c
+++ b/source/blender/render/intern/engine.c
@@ -757,7 +757,7 @@ static void engine_render_view_layer(Render *re,
{
/* Lock UI so scene can't be edited while we read from it in this render thread. */
if (re->draw_lock) {
- re->draw_lock(re->dlh, 1);
+ re->draw_lock(re->dlh, true);
}
/* Create depsgraph with scene evaluated at render resolution. */
@@ -773,7 +773,7 @@ static void engine_render_view_layer(Render *re,
}
if (re->draw_lock) {
- re->draw_lock(re->dlh, 0);
+ re->draw_lock(re->dlh, false);
}
/* Perform render with engine. */
@@ -824,7 +824,7 @@ bool RE_engine_render(Render *re, bool do_all)
/* Lock drawing in UI during data phase. */
if (re->draw_lock) {
- re->draw_lock(re->dlh, 1);
+ re->draw_lock(re->dlh, true);
}
/* update animation here so any render layer animation is applied before
@@ -852,7 +852,7 @@ bool RE_engine_render(Render *re, bool do_all)
if (re->result == NULL) {
/* Clear UI drawing locks. */
if (re->draw_lock) {
- re->draw_lock(re->dlh, 0);
+ re->draw_lock(re->dlh, false);
}
/* Too small image is handled earlier, here it could only happen if
* there was no sufficient memory to allocate all passes.
@@ -902,7 +902,7 @@ bool RE_engine_render(Render *re, bool do_all)
/* Clear UI drawing locks. */
if (re->draw_lock) {
- re->draw_lock(re->dlh, 0);
+ re->draw_lock(re->dlh, false);
}
/* Render view layers. */
diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c
index 0a8b8f24614..92bec9c6fd4 100644
--- a/source/blender/render/intern/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@ -1017,7 +1017,7 @@ void RE_progress_cb(Render *re, void *handle, void (*f)(void *handle, float))
re->prh = handle;
}
-void RE_draw_lock_cb(Render *re, void *handle, void (*f)(void *handle, int i))
+void RE_draw_lock_cb(Render *re, void *handle, void (*f)(void *handle, bool lock))
{
re->draw_lock = f;
re->dlh = handle;
diff --git a/source/blender/render/intern/render_types.h b/source/blender/render/intern/render_types.h
index 7a4374dcf7c..0488bf6e87a 100644
--- a/source/blender/render/intern/render_types.h
+++ b/source/blender/render/intern/render_types.h
@@ -141,7 +141,7 @@ struct Render {
void (*progress)(void *handle, float i);
void *prh;
- void (*draw_lock)(void *handle, int i);
+ void (*draw_lock)(void *handle, bool lock);
void *dlh;
int (*test_break)(void *handle);
void *tbh;
More information about the Bf-blender-cvs
mailing list