diff options
author | Monique <mdewanchand@atmind.nl> | 2022-09-08 15:43:50 +0300 |
---|---|---|
committer | Monique <mdewanchand@atmind.nl> | 2022-09-08 15:43:50 +0300 |
commit | 7e43934b8830ae67dc2bf23bddbbaf20bf664388 (patch) | |
tree | 99f6f413598e6955e85522440f41f47a98dc888a /source/blender/blenkernel/intern | |
parent | 78d4e63b5f1e0e1f80b4b25ecf40f85e030a4da8 (diff) |
Remove const char name
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/layer_utils.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.cc | 2 |
2 files changed, 8 insertions, 8 deletions
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; |