[Bf-blender-cvs] [7e43934b883] 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: 7e43934b8830ae67dc2bf23bddbbaf20bf664388
Author: Monique
Date: Thu Sep 8 14:43:50 2022 +0200
Branches: temp-T73411-view-layer-lazy-cache
https://developer.blender.org/rB7e43934b8830ae67dc2bf23bddbbaf20bf664388
Remove const char name
===================================================================
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/layer_utils.c
M source/blender/blenkernel/intern/object.cc
M source/blender/draw/intern/draw_common.c
M source/blender/editors/armature/armature_select.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_select.c
M source/blender/editors/lattice/editlattice_select.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/mesh/editmesh_polybuild.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/metaball/mball_edit.c
M source/blender/editors/object/object_add.cc
M source/blender/editors/object/object_constraint.c
M source/blender/editors/object/object_hook.c
M source/blender/editors/object/object_select.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_info/info_stats.cc
M source/blender/editors/space_outliner/outliner_collections.cc
M source/blender/editors/space_outliner/outliner_tools.cc
M source/blender/editors/space_outliner/outliner_tree.cc
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_buttons.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_gizmo_armature.c
M source/blender/editors/space_view3d/view3d_gizmo_camera.c
M source/blender/editors/space_view3d/view3d_gizmo_empty.c
M source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
M source/blender/editors/space_view3d/view3d_gizmo_light.c
M source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
M source/blender/editors/space_view3d/view3d_select.cc
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/transform/transform_snap_object.cc
M source/blender/editors/undo/ed_undo.c
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 26f22a0b751..48f1b50a89d 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -372,7 +372,7 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
data_.view_layer = _view_layer; \
data_.v3d = _v3d; \
BKE_view_layer_ensure_sync(_scene, _view_layer); \
- data_.base_active = BKE_view_layer_active_base_get(_view_layer, __func__); \
+ data_.base_active = BKE_view_layer_active_base_get(_view_layer); \
ITER_BEGIN (BKE_view_layer_bases_in_mode_iterator_begin, \
BKE_view_layer_bases_in_mode_iterator_next, \
BKE_view_layer_bases_in_mode_iterator_end, \
@@ -578,10 +578,9 @@ struct Object *BKE_view_layer_active_object_get(const struct ViewLayer *view_lay
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);
-struct Base *BKE_view_layer_active_base_get(struct ViewLayer *view_layer, const char *name);
+struct Base *BKE_view_layer_active_base_get(struct ViewLayer *view_layer);
-struct LayerCollection *BKE_view_layer_active_collection_get(struct ViewLayer *view_layer,
- const char *name);
+struct LayerCollection *BKE_view_layer_active_collection_get(struct ViewLayer *view_layer);
void BKE_view_layer_tag_out_of_sync(struct ViewLayer *view_layer);
void BKE_view_layer_ensure_sync(const struct Scene *scene, struct ViewLayer *view_layer);
diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c
index e98969d33ee..c13d27b2fff 100644
--- a/source/blender/blenkernel/intern/layer_utils.c
+++ b/source/blender/blenkernel/intern/layer_utils.c
@@ -217,20 +217,20 @@ struct Object **BKE_view_layer_array_from_objects_in_mode_unique_data(const Scen
struct ListBase *BKE_view_layer_object_bases_get(struct ViewLayer *view_layer)
{
- BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0, "Object Bases out of sync");
+ BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0, "Object Bases out of sync.");
return &view_layer->object_bases;
}
-struct Base *BKE_view_layer_active_base_get(struct ViewLayer *view_layer, const char *name)
+struct Base *BKE_view_layer_active_base_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, "Active Base out of sync.");
return view_layer->basact;
}
-struct LayerCollection *BKE_view_layer_active_collection_get(struct ViewLayer *view_layer,
- const char *name)
+struct LayerCollection *BKE_view_layer_active_collection_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,
+ "Active Collection out of sync.");
return view_layer->active_collection;
}
@@ -307,7 +307,7 @@ Object *BKE_view_layer_non_active_selected_object(const struct Scene *scene,
Object *BKE_view_layer_active_object_get(const ViewLayer *view_layer)
{
- Base *base = BKE_view_layer_active_base_get((ViewLayer *)view_layer, __func__);
+ Base *base = BKE_view_layer_active_base_get((ViewLayer *)view_layer);
return base ? base->object : NULL;
}
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index c8bc3847b6b..90d50ae4b43 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -2603,7 +2603,7 @@ Base **BKE_object_pose_base_array_get_ex(
const Scene *scene, ViewLayer *view_layer, View3D *v3d, uint *r_bases_len, bool unique)
{
BKE_view_layer_ensure_sync(scene, view_layer);
- Base *base_active = BKE_view_layer_active_base_get(view_layer, __func__);
+ Base *base_active = BKE_view_layer_active_base_get(view_layer);
Object *ob_pose = base_active ? BKE_object_pose_armature_get(base_active->object) : nullptr;
Base *base_pose = nullptr;
Base **bases = nullptr;
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 1bc774a0922..0898f28d072 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -281,7 +281,7 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color
const DRWContextState *draw_ctx = DRW_context_state_get();
const bool is_edit = (draw_ctx->object_mode & OB_MODE_EDIT) && (ob->mode & OB_MODE_EDIT);
BKE_view_layer_ensure_sync(draw_ctx->scene, view_layer);
- const Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+ const Base *base = BKE_view_layer_active_base_get(view_layer);
const bool active = base && ((ob->base_flag & BASE_FROM_DUPLI) ?
(DRW_object_get_dupli_parent(ob) == base->object) :
(base->object == ob));
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index 3a8fa1051f7..c5a591e027d 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -1104,7 +1104,7 @@ bool ED_armature_edit_select_pick_bone(bContext *C,
}
BKE_view_layer_ensure_sync(scene, view_layer);
- if (BKE_view_layer_active_base_get(view_layer, __func__) != basact) {
+ if (BKE_view_layer_active_base_get(view_layer) != basact) {
ED_object_base_activate(C, basact);
}
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 86524f4243e..e48de349366 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -4962,7 +4962,7 @@ bool ED_curve_editnurb_select_pick(bContext *C,
}
BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
- if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+ if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
ED_object_base_activate(C, basact);
}
diff --git a/source/blender/editors/curve/editcurve_select.c b/source/blender/editors/curve/editcurve_select.c
index d399314f2db..4b0aa8b29aa 100644
--- a/source/blender/editors/curve/editcurve_select.c
+++ b/source/blender/editors/curve/editcurve_select.c
@@ -2051,7 +2051,7 @@ static int edcu_shortest_path_pick_invoke(bContext *C, wmOperator *op, const wmE
BKE_curve_nurb_vert_active_set(cu, nu_dst, vert_dst_p);
BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
- if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+ if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
ED_object_base_activate(C, basact);
}
diff --git a/source/blender/editors/lattice/editlattice_select.c b/source/blender/editors/lattice/editlattice_select.c
index 7aefb17e064..4d0bac7e1c2 100644
--- a/source/blender/editors/lattice/editlattice_select.c
+++ b/source/blender/editors/lattice/editlattice_select.c
@@ -686,7 +686,7 @@ bool ED_lattice_select_pick(bContext *C, const int mval[2], const struct SelectP
}
BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
- if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+ if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
ED_object_base_activate(C, basact);
}
diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c
index 0424818504c..53f3b93aa35 100644
--- a/source/blender/editors/mesh/editmesh_path.c
+++ b/source/blender/editors/mesh/editmesh_path.c
@@ -680,7 +680,7 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *op, const wmE
em_setup_viewcontext(C, &vc);
copy_v2_v2_int(vc.mval, event->mval);
BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
- Base *basact = BKE_view_layer_active_base_get(vc.view_layer, __func__);
+ Base *basact = BKE_view_layer_active_base_get(vc.view_layer);
BMEditMesh *em = vc.em;
view3d_operator_needs_opengl(C);
@@ -734,8 +734,8 @@ static int edbm_shortest_path_pick_invoke(bContext *C, wmOperator *op, const wmE
return OPERATOR_PASS_THROUGH;
}
- BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
- if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+ BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
+ if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
ED_object_base_activate(C, basact);
}
diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c
index 95de13f32b6..4a080b534c4 100644
--- a/source/blender/editors/mesh/editmesh_polybuild.c
+++ b/source/blender/editors/mesh/editmesh_polybuild.c
@@ -90,7 +90,7 @@ static bool edbm_preselect_or_active(bContext *C, const View3D *v3d, Base **r_ba
const Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
BKE_view_layer_ensure_sync(scene, view_layer);
- Base *base = BKE_view_layer_active_base_get(view_layer, __func__);
+ Base *base = BKE_view_layer_active_base_get(view_layer);
Object *obedit = base->object;
BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMesh *bm = em->bm;
@@ -153,7 +153,7 @@ static int edbm_polybuild_transform_at_cursor_invoke(bContext *C,
});
if (basact != NULL) {
BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
- if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+ if (BKE_view_layer_active_base_get(vc.view_layer) != basact) {
ED_object_base_activate(C, basact);
}
}
@@ -241,7 +241,7 @@ static int edbm_polybuild_delete_at_cursor_invoke(bContext *C,
});
if (basact != NULL) {
BKE_view_layer_ensure_sync(vc.scene, vc.view_layer);
- if (BKE_view_layer_active_base_get(vc.view_layer, __func__) != basact) {
+ if (BKE
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list