diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2022-09-08 23:32:40 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2022-09-08 23:32:40 +0300 |
commit | ecaab96e0bd615eb69895f9adc6d186bb2fece0d (patch) | |
tree | edfd6793ce808a345bd227b4b63103f901868e56 /source/blender/blenkernel/intern | |
parent | 06a5741f427467d671986ca907d47b76d53f3f6e (diff) |
WIP: Adding const Scene* to many areas.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/blender_copybuffer.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/collision.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer_utils.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.cc | 11 |
7 files changed, 30 insertions, 16 deletions
diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index 4b507beb6b3..82df2714a71 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -150,7 +150,7 @@ int BKE_copybuffer_paste(bContext *C, return 0; } - BKE_view_layer_base_deselect_all(view_layer); + BKE_view_layer_base_deselect_all(scene, view_layer); copybuffer_append(lapp_context, bmain, reports); diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 41ec120519b..95457b6f790 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -859,7 +859,9 @@ void BKE_collection_object_cache_free(Collection *collection) collection_object_cache_free(collection); } -Base *BKE_collection_or_layer_objects(const ViewLayer *view_layer, Collection *collection) +Base *BKE_collection_or_layer_objects(const Scene *UNUSED(scene), + ViewLayer *view_layer, + Collection *collection) { if (collection) { return BKE_collection_object_cache_get(collection).first; @@ -1785,13 +1787,16 @@ static bool collection_objects_select(ViewLayer *view_layer, Collection *collect return changed; } -bool BKE_collection_objects_select(ViewLayer *view_layer, Collection *collection, bool deselect) +bool BKE_collection_objects_select(const Scene *scene, + ViewLayer *view_layer, + Collection *collection, + bool deselect) { LayerCollection *layer_collection = BKE_layer_collection_first_from_scene_collection(view_layer, collection); if (layer_collection != NULL) { - return BKE_layer_collection_objects_select(view_layer, layer_collection, deselect); + return BKE_layer_collection_objects_select(scene, view_layer, layer_collection, deselect); } return collection_objects_select(view_layer, collection, deselect); diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index ae99f0d17df..0bacd657981 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -1248,8 +1248,9 @@ ListBase *BKE_collision_relations_create(Depsgraph *depsgraph, Collection *collection, unsigned int modifier_type) { + const Scene *scene = DEG_get_input_scene(depsgraph); ViewLayer *view_layer = DEG_get_input_view_layer(depsgraph); - Base *base = BKE_collection_or_layer_objects(view_layer, collection); + Base *base = BKE_collection_or_layer_objects(scene, view_layer, collection); const bool for_render = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER); const int base_flag = (for_render) ? BASE_ENABLED_RENDER : BASE_ENABLED_VIEWPORT; diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index f6a2975bea8..6719590e7c0 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -207,10 +207,11 @@ static void add_effector_evaluation(ListBase **effectors, } ListBase *BKE_effector_relations_create(Depsgraph *depsgraph, + const Scene *scene, ViewLayer *view_layer, Collection *collection) { - Base *base = BKE_collection_or_layer_objects(view_layer, collection); + Base *base = BKE_collection_or_layer_objects(scene, view_layer, collection); const bool for_render = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER); const int base_flag = (for_render) ? BASE_ENABLED_RENDER : BASE_ENABLED_VIEWPORT; diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 2b49da6dbe9..a7698e78fcc 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -1444,7 +1444,9 @@ bool BKE_layer_collection_objects_select(ViewLayer *view_layer, LayerCollection return changed; } -bool BKE_layer_collection_has_selected_objects(ViewLayer *view_layer, LayerCollection *lc) +bool BKE_layer_collection_has_selected_objects(const Scene *UNUSED(scene), + ViewLayer *view_layer, + LayerCollection *lc) { if (lc->collection->flag & COLLECTION_HIDE_SELECT) { return false; @@ -1462,7 +1464,7 @@ bool BKE_layer_collection_has_selected_objects(ViewLayer *view_layer, LayerColle } LISTBASE_FOREACH (LayerCollection *, iter, &lc->layer_collections) { - if (BKE_layer_collection_has_selected_objects(view_layer, iter)) { + if (BKE_layer_collection_has_selected_objects(scene, view_layer, iter)) { return true; } } diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c index 3e41479c22c..b5e0112a827 100644 --- a/source/blender/blenkernel/intern/layer_utils.c +++ b/source/blender/blenkernel/intern/layer_utils.c @@ -167,14 +167,15 @@ struct Base **BKE_view_layer_array_from_bases_in_edit_mode(ViewLayer *view_layer return BKE_view_layer_array_from_bases_in_mode_params(view_layer, v3d, r_len, ¶ms); } -struct Object **BKE_view_layer_array_from_objects_in_edit_mode_unique_data(ViewLayer *view_layer, +struct Object **BKE_view_layer_array_from_objects_in_edit_mode_unique_data(const Scene *scene, + ViewLayer *view_layer, const View3D *v3d, uint *r_len) { struct ObjectsInModeParams params = {0}; params.object_mode = OB_MODE_EDIT; params.no_dup_data = true; - return BKE_view_layer_array_from_objects_in_mode_params(view_layer, v3d, r_len, ¶ms); + return BKE_view_layer_array_from_objects_in_mode_params(scene, view_layer, v3d, r_len, ¶ms); } struct Base **BKE_view_layer_array_from_bases_in_edit_mode_unique_data(ViewLayer *view_layer, @@ -188,7 +189,7 @@ struct Base **BKE_view_layer_array_from_bases_in_edit_mode_unique_data(ViewLayer } struct Object **BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs( - ViewLayer *view_layer, const View3D *v3d, uint *r_len) + const Scene *UNUSED(scene), ViewLayer *view_layer, const View3D *v3d, uint *r_len) { struct ObjectsInModeParams params = {0}; params.object_mode = OB_MODE_EDIT; @@ -197,7 +198,8 @@ struct Object **BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_ return BKE_view_layer_array_from_objects_in_mode_params(view_layer, v3d, r_len, ¶ms); } -struct Object **BKE_view_layer_array_from_objects_in_mode_unique_data(ViewLayer *view_layer, +struct Object **BKE_view_layer_array_from_objects_in_mode_unique_data(const Scene *UNUSED(scene), + ViewLayer *view_layer, const View3D *v3d, uint *r_len, const eObjectMode mode) diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index e4d09fddb79..48c1d969805 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -2262,7 +2262,7 @@ static Object *object_add_common(Main *bmain, ViewLayer *view_layer, int type, c { Object *ob = BKE_object_add_only_object(bmain, type, name); ob->data = BKE_object_obdata_add_from_type(bmain, type, name); - BKE_view_layer_base_deselect_all(view_layer); + BKE_view_layer_base_deselect_all(scene, view_layer); DEG_id_tag_update_ex( bmain, &ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION); @@ -2308,7 +2308,7 @@ Object *BKE_object_add_for_data( id_us_plus(data); } - BKE_view_layer_base_deselect_all(view_layer); + BKE_view_layer_base_deselect_all(scene, view_layer); DEG_id_tag_update_ex( bmain, &ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION); @@ -2622,9 +2622,12 @@ Base **BKE_object_pose_base_array_get_unique(ViewLayer *view_layer, View3D *v3d, { return BKE_object_pose_base_array_get_ex(view_layer, v3d, r_bases_len, true); } -Base **BKE_object_pose_base_array_get(ViewLayer *view_layer, View3D *v3d, uint *r_bases_len) +Base **BKE_object_pose_base_array_get(const Scene *scene, + ViewLayer *view_layer, + View3D *v3d, + uint *r_bases_len) { - return BKE_object_pose_base_array_get_ex(view_layer, v3d, r_bases_len, false); + return BKE_object_pose_base_array_get_ex(scene, view_layer, v3d, r_bases_len, false); } void BKE_object_transform_copy(Object *ob_tar, const Object *ob_src) |