[Bf-blender-cvs] [78d4e63b5f1] temp-T73411-view-layer-lazy-cache: Remove const char name
Monique
noreply at git.blender.org
Thu Sep 8 15:25:38 CEST 2022
Commit: 78d4e63b5f1e0e1f80b4b25ecf40f85e030a4da8
Author: Monique
Date: Thu Sep 8 14:31:23 2022 +0200
Branches: temp-T73411-view-layer-lazy-cache
https://developer.blender.org/rB78d4e63b5f1e0e1f80b4b25ecf40f85e030a4da8
Remove const char name
===================================================================
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/layer_utils.c
M source/blender/blenkernel/intern/mball.cc
M source/blender/blenkernel/intern/object.cc
M source/blender/blenkernel/intern/scene.cc
M source/blender/blenloader/intern/versioning_280.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/gpencil/gpencil_armature.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_utils.c
M source/blender/editors/render/render_internal.cc
M source/blender/editors/render/render_preview.cc
M source/blender/editors/screen/screen_context.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/space_outliner/outliner_collections.cc
M source/blender/editors/space_outliner/outliner_select.cc
M source/blender/editors/space_outliner/outliner_tools.cc
M source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_navigate.c
M source/blender/editors/space_view3d/view3d_select.cc
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/transform/transform_convert_object.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/transform/transform_snap_object.cc
M source/blender/editors/undo/ed_undo.c
M source/blender/io/alembic/exporter/abc_subdiv_disabler.cc
M source/blender/io/collada/BlenderContext.cpp
M source/blender/io/gpencil/intern/gpencil_io_base.cc
M source/blender/makesrna/intern/rna_layer.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index dcef62c1a78..26f22a0b751 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -440,7 +440,7 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
Object *_instance; \
Base *_base; \
BKE_view_layer_ensure_sync(scene, view_layer); \
- for (_base = (Base *)BKE_view_layer_object_bases_get(view_layer, __func__)->first; _base; \
+ for (_base = (Base *)BKE_view_layer_object_bases_get(view_layer)->first; _base; \
_base = _base->next) { \
_instance = _base->object;
@@ -577,7 +577,7 @@ struct Object **BKE_view_layer_array_from_objects_in_mode_unique_data(const stru
struct Object *BKE_view_layer_active_object_get(const struct ViewLayer *view_layer);
struct Object *BKE_view_layer_edit_object_get(const struct ViewLayer *view_layer);
-struct ListBase *BKE_view_layer_object_bases_get(struct ViewLayer *view_layer, const char *name);
+struct ListBase *BKE_view_layer_object_bases_get(struct ViewLayer *view_layer);
struct Base *BKE_view_layer_active_base_get(struct ViewLayer *view_layer, const char *name);
struct LayerCollection *BKE_view_layer_active_collection_get(struct ViewLayer *view_layer,
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 7d28533a875..afb5f4ef2a6 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -860,7 +860,7 @@ Base *BKE_collection_or_layer_objects(const Scene *scene,
return BKE_collection_object_cache_get(collection).first;
}
BKE_view_layer_ensure_sync(scene, view_layer);
- return BKE_view_layer_object_bases_get(view_layer, __func__)->first;
+ return BKE_view_layer_object_bases_get(view_layer)->first;
}
/** \} */
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index d7cb64f8256..d354dfb0939 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -562,7 +562,7 @@ static int get_light(Scene *scene, ViewLayer *view_layer, float *light)
/* Try to find a lamp, preferably local. */
BKE_view_layer_ensure_sync(scene, view_layer);
- LISTBASE_FOREACH (Base *, base_tmp, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, base_tmp, BKE_view_layer_object_bases_get(view_layer)) {
if (base_tmp->object->type == OB_LAMP) {
Light *la = base_tmp->object->data;
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index b5d874a4968..244f5f85534 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -286,7 +286,7 @@ void BKE_view_layer_free_ex(ViewLayer *view_layer, const bool do_id_user)
void BKE_view_layer_selected_objects_tag(const Scene *scene, ViewLayer *view_layer, const int tag)
{
BKE_view_layer_ensure_sync(scene, view_layer);
- LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
if ((base->flag & BASE_SELECTED) != 0) {
base->object->flag |= tag;
}
@@ -312,7 +312,7 @@ static bool find_scene_collection_in_scene_collections(ListBase *lb, const Layer
Object *BKE_view_layer_camera_find(const Scene *scene, ViewLayer *view_layer)
{
BKE_view_layer_ensure_sync(scene, view_layer);
- LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
if (base->object->type == OB_CAMERA) {
return base->object;
}
@@ -392,7 +392,7 @@ Base *BKE_view_layer_base_find(ViewLayer *view_layer, Object *ob)
void BKE_view_layer_base_deselect_all(const Scene *scene, ViewLayer *view_layer)
{
BKE_view_layer_ensure_sync(scene, view_layer);
- LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
base->flag &= ~BASE_SELECTED;
}
}
@@ -1526,7 +1526,7 @@ void BKE_base_set_visible(Scene *scene, ViewLayer *view_layer, Base *base, bool
if (!extend) {
/* Make only one base visible. */
BKE_view_layer_ensure_sync(scene, view_layer);
- LISTBASE_FOREACH (Base *, other, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, other, BKE_view_layer_object_bases_get(view_layer)) {
other->flag |= BASE_HIDDEN;
}
@@ -1721,7 +1721,7 @@ void BKE_layer_collection_local_sync(const Scene *scene, ViewLayer *view_layer,
/* Reset flags and set the bases visible by default. */
BKE_view_layer_ensure_sync(scene, view_layer);
- LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
base->local_collections_bits &= ~local_collections_uuid;
}
@@ -1977,7 +1977,7 @@ static void object_bases_iterator_begin(BLI_Iterator *iter, void *data_in_v, con
ObjectsVisibleIteratorData *data_in = data_in_v;
ViewLayer *view_layer = data_in->view_layer;
const View3D *v3d = data_in->v3d;
- Base *base = BKE_view_layer_object_bases_get(view_layer, __func__)->first;
+ Base *base = BKE_view_layer_object_bases_get(view_layer)->first;
/* when there are no objects */
if (base == NULL) {
@@ -2279,13 +2279,12 @@ static void layer_eval_view_layer(struct Depsgraph *depsgraph,
/* Create array of bases, for fast index-based lookup. */
BKE_view_layer_ensure_sync(scene, view_layer);
- const int num_object_bases = BLI_listbase_count(
- BKE_view_layer_object_bases_get(view_layer, __func__));
+ const int num_object_bases = BLI_listbase_count(BKE_view_layer_object_bases_get(view_layer));
MEM_SAFE_FREE(view_layer->object_bases_array);
view_layer->object_bases_array = MEM_malloc_arrayN(
num_object_bases, sizeof(Base *), "view_layer->object_bases_array");
int base_index = 0;
- LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
view_layer->object_bases_array[base_index++] = base;
}
}
@@ -2319,7 +2318,7 @@ void BKE_view_layer_blend_write(BlendWriter *writer, const Scene *scene, ViewLay
{
BKE_view_layer_ensure_sync(scene, view_layer);
BLO_write_struct(writer, ViewLayer, view_layer);
- BLO_write_struct_list(writer, Base, BKE_view_layer_object_bases_get(view_layer, __func__));
+ BLO_write_struct_list(writer, Base, BKE_view_layer_object_bases_get(view_layer));
if (view_layer->id_properties) {
IDP_BlendWrite(writer, view_layer->id_properties);
diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c
index cdd337b5cc1..e98969d33ee 100644
--- a/source/blender/blenkernel/intern/layer_utils.c
+++ b/source/blender/blenkernel/intern/layer_utils.c
@@ -215,9 +215,9 @@ struct Object **BKE_view_layer_array_from_objects_in_mode_unique_data(const Scen
return BKE_view_layer_array_from_objects_in_mode_params(scene, view_layer, v3d, r_len, ¶ms);
}
-struct ListBase *BKE_view_layer_object_bases_get(struct ViewLayer *view_layer, const char *name)
+struct ListBase *BKE_view_layer_object_bases_get(struct ViewLayer *view_layer)
{
- BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0, name);
+ BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0, "Object Bases out of sync");
return &view_layer->object_bases;
}
diff --git a/source/blender/blenkernel/intern/mball.cc b/source/blender/blenkernel/intern/mball.cc
index d848c09066a..03786d9c4b6 100644
--- a/source/blender/blenkernel/intern/mball.cc
+++ b/source/blender/blenkernel/intern/mball.cc
@@ -451,7 +451,7 @@ Object *BKE_mball_basis_find(Scene *scene, Object *object)
LISTBASE_FOREACH (ViewLayer *, view_layer, &scene->view_layers) {
BKE_view_layer_ensure_sync(scene, view_layer);
- LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
Object *ob = base->object;
if ((ob->type == OB_MBALL) && !(base->flag & BASE_FROM_DUPLI)) {
if (ob != bob) {
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index 61f941c0a8b..c8bc3847b6b 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -5169,12 +5169,12 @@ LinkNode *BKE_object_relational_superset(const Scene *scene,
/* Remove markers from all objects */
BKE_view_layer_ensure_sync(scene, view_layer);
- LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
base->object->id.tag &= ~LIB_TAG_DOIT;
}
/* iterate over all selected and visible objects */
- LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
if (objectSet == OB_SET_ALL) {
/* as we get all anyways just add it */
Object *ob = base->object;
@@ -5210,8 +5210,7 @@ LinkNode *BKE_object_relational_superset(const Scene *scene,
/* child relationship */
if (includeFilter & (OB_REL_CHILDREN | OB_REL_CHILDREN_RECURSIVE)) {
- LISTBASE_FOREACH (
- Base *, local_base, BKE_view_layer_object_bases_get(view_layer, __func__)) {
+ LISTBASE_FOREACH (Base *, local_base, BKE_view_layer_object_bases_get(view_layer)) {
if (BASE_EDITABLE(((View3D *)nullptr), local_base)) {
Object *child = local_base->object;
diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc
index be6c064f151..7cd5b7087a0 100644
--- a/source/blender/blenkernel/intern/scene.cc
+++ b/sour
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list