diff options
Diffstat (limited to 'source/blender/blenkernel/BKE_layer.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 4cc7dc6283f..ecad9c21f99 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -63,26 +63,26 @@ struct ViewLayer *BKE_view_layer_add(struct Scene *scene, const char *name); /* DEPRECATED */ struct ViewLayer *BKE_view_layer_context_active_PLACEHOLDER(const struct Scene *scene); -void BKE_view_layer_free(struct ViewLayer *sl); +void BKE_view_layer_free(struct ViewLayer *view_layer); -void BKE_view_layer_selected_objects_tag(struct ViewLayer *sl, const int tag); +void BKE_view_layer_selected_objects_tag(struct ViewLayer *view_layer, const int tag); -struct Object *BKE_view_layer_camera_find(struct ViewLayer *sl); +struct Object *BKE_view_layer_camera_find(struct ViewLayer *view_layer); struct ViewLayer *BKE_view_layer_find_from_collection(const struct Scene *scene, struct LayerCollection *lc); -struct Base *BKE_view_layer_base_find(struct ViewLayer *sl, struct Object *ob); -struct Base *BKE_view_layer_base_find_by_name(struct ViewLayer *sl, struct Object *ob); -void BKE_view_layer_base_deselect_all(struct ViewLayer *sl); -void BKE_view_layer_base_select(struct ViewLayer *sl, struct Base *selbase); +struct Base *BKE_view_layer_base_find(struct ViewLayer *view_layer, struct Object *ob); +struct Base *BKE_view_layer_base_find_by_name(struct ViewLayer *view_layer, struct Object *ob); +void BKE_view_layer_base_deselect_all(struct ViewLayer *view_layer); +void BKE_view_layer_base_select(struct ViewLayer *view_layer, struct Base *selbase); -void BKE_layer_collection_free(struct ViewLayer *sl, struct LayerCollection *lc); +void BKE_layer_collection_free(struct ViewLayer *view_layer, struct LayerCollection *lc); -struct LayerCollection *BKE_layer_collection_get_active(struct ViewLayer *sl); -struct LayerCollection *BKE_layer_collection_get_active_ensure(struct Scene *scene, struct ViewLayer *sl); +struct LayerCollection *BKE_layer_collection_get_active(struct ViewLayer *view_layer); +struct LayerCollection *BKE_layer_collection_get_active_ensure(struct Scene *scene, struct ViewLayer *view_layer); -int BKE_layer_collection_count(struct ViewLayer *sl); +int BKE_layer_collection_count(struct ViewLayer *view_layer); -struct LayerCollection *BKE_layer_collection_from_index(struct ViewLayer *sl, const int index); -int BKE_layer_collection_findindex(struct ViewLayer *sl, const struct LayerCollection *lc); +struct LayerCollection *BKE_layer_collection_from_index(struct ViewLayer *view_layer, const int index); +int BKE_layer_collection_findindex(struct ViewLayer *view_layer, const struct LayerCollection *lc); bool BKE_layer_collection_move_above(const struct Scene *scene, struct LayerCollection *lc_dst, struct LayerCollection *lc_src); bool BKE_layer_collection_move_below(const struct Scene *scene, struct LayerCollection *lc_dst, struct LayerCollection *lc_src); @@ -90,14 +90,14 @@ bool BKE_layer_collection_move_into(const struct Scene *scene, struct LayerColle void BKE_layer_collection_resync(const struct Scene *scene, const struct SceneCollection *sc); -struct LayerCollection *BKE_collection_link(struct ViewLayer *sl, struct SceneCollection *sc); +struct LayerCollection *BKE_collection_link(struct ViewLayer *view_layer, struct SceneCollection *sc); -void BKE_collection_unlink(struct ViewLayer *sl, struct LayerCollection *lc); +void BKE_collection_unlink(struct ViewLayer *view_layer, struct LayerCollection *lc); -void BKE_collection_enable(struct ViewLayer *sl, struct LayerCollection *lc); -void BKE_collection_disable(struct ViewLayer *sl, struct LayerCollection *lc); +void BKE_collection_enable(struct ViewLayer *view_layer, struct LayerCollection *lc); +void BKE_collection_disable(struct ViewLayer *view_layer, struct LayerCollection *lc); -bool BKE_view_layer_has_collection(struct ViewLayer *sl, const struct SceneCollection *sc); +bool BKE_view_layer_has_collection(struct ViewLayer *view_layer, const struct SceneCollection *sc); bool BKE_scene_has_object(struct Scene *scene, struct Object *ob); /* syncing */ @@ -125,8 +125,8 @@ void BKE_layer_collection_engine_settings_create(struct IDProperty *root); void BKE_layer_collection_engine_settings_validate_scene(struct Scene *scene); void BKE_layer_collection_engine_settings_validate_collection(struct LayerCollection *lc); -struct IDProperty *BKE_view_layer_engine_evaluated_get(struct ViewLayer *sl, const int type, const char *engine_name); -struct IDProperty *BKE_view_layer_engine_layer_get(struct ViewLayer *sl, const int type, const char *engine_name); +struct IDProperty *BKE_view_layer_engine_evaluated_get(struct ViewLayer *view_layer, const int type, const char *engine_name); +struct IDProperty *BKE_view_layer_engine_layer_get(struct ViewLayer *view_layer, const int type, const char *engine_name); struct IDProperty *BKE_view_layer_engine_scene_get(struct Scene *scene, const int type, const char *engine_name); void BKE_view_layer_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func); void BKE_view_layer_engine_settings_callback_free(void); @@ -182,55 +182,55 @@ void BKE_visible_bases_iterator_begin(BLI_Iterator *iter, void *data_in); void BKE_visible_bases_iterator_next(BLI_Iterator *iter); void BKE_visible_bases_iterator_end(BLI_Iterator *iter); -#define FOREACH_SELECTED_OBJECT(sl, _instance) \ +#define FOREACH_SELECTED_OBJECT(view_layer, _instance) \ ITER_BEGIN(BKE_selected_objects_iterator_begin, \ BKE_selected_objects_iterator_next, \ BKE_selected_objects_iterator_end, \ - sl, Object *, _instance) + view_layer, Object *, _instance) #define FOREACH_SELECTED_OBJECT_END \ ITER_END -#define FOREACH_VISIBLE_OBJECT(sl, _instance) \ +#define FOREACH_VISIBLE_OBJECT(view_layer, _instance) \ ITER_BEGIN(BKE_visible_objects_iterator_begin, \ BKE_visible_objects_iterator_next, \ BKE_visible_objects_iterator_end, \ - sl, Object *, _instance) + view_layer, Object *, _instance) #define FOREACH_VISIBLE_OBJECT_END \ ITER_END -#define FOREACH_SELECTED_BASE(sl, _instance) \ +#define FOREACH_SELECTED_BASE(view_layer, _instance) \ ITER_BEGIN(BKE_selected_bases_iterator_begin, \ BKE_selected_bases_iterator_next, \ BKE_selected_bases_iterator_end, \ - sl, Base *, _instance) + view_layer, Base *, _instance) #define FOREACH_SELECTED_BASE_END \ ITER_END -#define FOREACH_VISIBLE_BASE(sl, _instance) \ +#define FOREACH_VISIBLE_BASE(view_layer, _instance) \ ITER_BEGIN(BKE_visible_bases_iterator_begin, \ BKE_visible_bases_iterator_next, \ BKE_visible_bases_iterator_end, \ - sl, Base *, _instance) + view_layer, Base *, _instance) #define FOREACH_VISIBLE_BASE_END \ ITER_END -#define FOREACH_OBJECT(sl, _instance) \ +#define FOREACH_OBJECT(view_layer, _instance) \ { \ Object *_instance; \ Base *base; \ - for (base = (sl)->object_bases.first; base; base = base->next) { \ + for (base = (view_layer)->object_bases.first; base; base = base->next) { \ _instance = base->object; #define FOREACH_OBJECT_END \ } \ } -#define FOREACH_OBJECT_FLAG(scene, sl, flag, _instance) \ +#define FOREACH_OBJECT_FLAG(scene, view_layer, flag, _instance) \ { \ IteratorBeginCb func_begin; \ IteratorCb func_next, func_end; \ @@ -240,7 +240,7 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *iter); func_begin = &BKE_selected_objects_iterator_begin; \ func_next = &BKE_selected_objects_iterator_next; \ func_end = &BKE_selected_objects_iterator_end; \ - data_in = (sl); \ + data_in = (view_layer); \ } \ else { \ func_begin = BKE_scene_objects_iterator_begin; \ |