Cleanup: pass v3d as const to view layer utilities

This commit is contained in:
2020-08-30 13:13:44 +10:00
parent 3abbae2d7c
commit e06050945e
3 changed files with 26 additions and 14 deletions

View File

@@ -98,7 +98,7 @@ int BKE_layer_collection_findindex(struct ViewLayer *view_layer, const struct La
void BKE_main_collection_sync(const struct Main *bmain); void BKE_main_collection_sync(const struct Main *bmain);
void BKE_scene_collection_sync(const struct Scene *scene); void BKE_scene_collection_sync(const struct Scene *scene);
void BKE_layer_collection_sync(const struct Scene *scene, struct ViewLayer *view_layer); void BKE_layer_collection_sync(const struct Scene *scene, struct ViewLayer *view_layer);
void BKE_layer_collection_local_sync(struct ViewLayer *view_layer, struct View3D *v3d); void BKE_layer_collection_local_sync(struct ViewLayer *view_layer, const struct View3D *v3d);
void BKE_main_collection_sync_remap(const struct Main *bmain); void BKE_main_collection_sync_remap(const struct Main *bmain);
@@ -129,7 +129,7 @@ void BKE_layer_collection_isolate_global(struct Scene *scene,
struct LayerCollection *lc, struct LayerCollection *lc,
bool extend); bool extend);
void BKE_layer_collection_isolate_local(struct ViewLayer *view_layer, void BKE_layer_collection_isolate_local(struct ViewLayer *view_layer,
struct View3D *v3d, const struct View3D *v3d,
struct LayerCollection *lc, struct LayerCollection *lc,
bool extend); bool extend);
void BKE_layer_collection_set_visible(struct ViewLayer *view_layer, void BKE_layer_collection_set_visible(struct ViewLayer *view_layer,
@@ -150,7 +150,7 @@ void BKE_layer_eval_view_layer_indexed(struct Depsgraph *depsgraph,
typedef struct ObjectsVisibleIteratorData { typedef struct ObjectsVisibleIteratorData {
struct ViewLayer *view_layer; struct ViewLayer *view_layer;
struct View3D *v3d; const struct View3D *v3d;
} ObjectsVisibleIteratorData; } ObjectsVisibleIteratorData;
void BKE_view_layer_selected_objects_iterator_begin(BLI_Iterator *iter, void *data_in); void BKE_view_layer_selected_objects_iterator_begin(BLI_Iterator *iter, void *data_in);
@@ -169,7 +169,7 @@ struct ObjectsInModeIteratorData {
int object_mode; int object_mode;
int object_type; int object_type;
struct ViewLayer *view_layer; struct ViewLayer *view_layer;
struct View3D *v3d; const struct View3D *v3d;
struct Base *base_active; struct Base *base_active;
}; };
@@ -361,13 +361,13 @@ struct ObjectsInModeParams {
}; };
Base **BKE_view_layer_array_from_bases_in_mode_params(struct ViewLayer *view_layer, Base **BKE_view_layer_array_from_bases_in_mode_params(struct ViewLayer *view_layer,
struct View3D *v3d, const struct View3D *v3d,
uint *r_len, uint *r_len,
const struct ObjectsInModeParams *params); const struct ObjectsInModeParams *params);
struct Object **BKE_view_layer_array_from_objects_in_mode_params( struct Object **BKE_view_layer_array_from_objects_in_mode_params(
struct ViewLayer *view_layer, struct ViewLayer *view_layer,
struct View3D *v3d, const struct View3D *v3d,
uint *len, uint *len,
const struct ObjectsInModeParams *params); const struct ObjectsInModeParams *params);

View File

@@ -1088,7 +1088,7 @@ bool BKE_base_is_visible(const View3D *v3d, const Base *base)
return base->flag & BASE_VISIBLE_VIEWLAYER; return base->flag & BASE_VISIBLE_VIEWLAYER;
} }
bool BKE_object_is_visible_in_viewport(const struct View3D *v3d, const struct Object *ob) bool BKE_object_is_visible_in_viewport(const View3D *v3d, const struct Object *ob)
{ {
BLI_assert(v3d != NULL); BLI_assert(v3d != NULL);
@@ -1231,7 +1231,7 @@ static void layer_collection_local_sync(ViewLayer *view_layer,
} }
} }
void BKE_layer_collection_local_sync(ViewLayer *view_layer, View3D *v3d) void BKE_layer_collection_local_sync(ViewLayer *view_layer, const View3D *v3d)
{ {
const unsigned short local_collections_uuid = v3d->local_collections_uuid; const unsigned short local_collections_uuid = v3d->local_collections_uuid;
@@ -1251,7 +1251,7 @@ void BKE_layer_collection_local_sync(ViewLayer *view_layer, View3D *v3d)
* Same as BKE_layer_collection_isolate_local but for a viewport * Same as BKE_layer_collection_isolate_local but for a viewport
*/ */
void BKE_layer_collection_isolate_local(ViewLayer *view_layer, void BKE_layer_collection_isolate_local(ViewLayer *view_layer,
View3D *v3d, const View3D *v3d,
LayerCollection *lc, LayerCollection *lc,
bool extend) bool extend)
{ {
@@ -1463,11 +1463,11 @@ bool BKE_scene_has_object(Scene *scene, Object *ob)
* \{ */ * \{ */
typedef struct LayerObjectBaseIteratorData { typedef struct LayerObjectBaseIteratorData {
View3D *v3d; const View3D *v3d;
Base *base; Base *base;
} LayerObjectBaseIteratorData; } LayerObjectBaseIteratorData;
static bool object_bases_iterator_is_valid(View3D *v3d, Base *base, const int flag) static bool object_bases_iterator_is_valid(const View3D *v3d, Base *base, const int flag)
{ {
BLI_assert((v3d == NULL) || (v3d->spacetype == SPACE_VIEW3D)); BLI_assert((v3d == NULL) || (v3d->spacetype == SPACE_VIEW3D));
@@ -1484,7 +1484,7 @@ static void object_bases_iterator_begin(BLI_Iterator *iter, void *data_in_v, con
{ {
ObjectsVisibleIteratorData *data_in = data_in_v; ObjectsVisibleIteratorData *data_in = data_in_v;
ViewLayer *view_layer = data_in->view_layer; ViewLayer *view_layer = data_in->view_layer;
View3D *v3d = data_in->v3d; const View3D *v3d = data_in->v3d;
Base *base = view_layer->object_bases.first; Base *base = view_layer->object_bases.first;
/* when there are no objects */ /* when there are no objects */

View File

@@ -34,8 +34,12 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
/* -------------------------------------------------------------------- */
/** \name Objects in Mode Array
* \{ */
Base **BKE_view_layer_array_from_bases_in_mode_params(ViewLayer *view_layer, Base **BKE_view_layer_array_from_bases_in_mode_params(ViewLayer *view_layer,
View3D *v3d, const View3D *v3d,
uint *r_len, uint *r_len,
const struct ObjectsInModeParams *params) const struct ObjectsInModeParams *params)
{ {
@@ -83,7 +87,7 @@ Base **BKE_view_layer_array_from_bases_in_mode_params(ViewLayer *view_layer,
} }
Object **BKE_view_layer_array_from_objects_in_mode_params(ViewLayer *view_layer, Object **BKE_view_layer_array_from_objects_in_mode_params(ViewLayer *view_layer,
View3D *v3d, const View3D *v3d,
uint *r_len, uint *r_len,
const struct ObjectsInModeParams *params) const struct ObjectsInModeParams *params)
{ {
@@ -97,6 +101,12 @@ Object **BKE_view_layer_array_from_objects_in_mode_params(ViewLayer *view_layer,
return (Object **)base_array; return (Object **)base_array;
} }
/** \} */
/* -------------------------------------------------------------------- */
/** \name Filter Functions
* \{ */
bool BKE_view_layer_filter_edit_mesh_has_uvs(Object *ob, void *UNUSED(user_data)) bool BKE_view_layer_filter_edit_mesh_has_uvs(Object *ob, void *UNUSED(user_data))
{ {
if (ob->type == OB_MESH) { if (ob->type == OB_MESH) {
@@ -124,3 +134,5 @@ bool BKE_view_layer_filter_edit_mesh_has_edges(Object *ob, void *UNUSED(user_dat
} }
return false; return false;
} }
/** \} */