From 62592af84349629bccaa1c81df7965f4deb39fd4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Feb 2021 10:27:50 +1100 Subject: Cleanup: pass scene as const --- source/blender/blenkernel/BKE_modifier.h | 10 +++++----- source/blender/blenkernel/intern/modifier.c | 10 +++++----- source/blender/draw/intern/draw_cache_impl_mesh.c | 3 +-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 32b74d161b2..ab2ecbe2507 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -453,7 +453,7 @@ void BKE_modifiers_foreach_tex_link(struct Object *ob, TexWalkFunc walk, void *u struct ModifierData *BKE_modifiers_findby_type(struct Object *ob, ModifierType type); struct ModifierData *BKE_modifiers_findby_name(struct Object *ob, const char *name); void BKE_modifiers_clear_errors(struct Object *ob); -int BKE_modifiers_get_cage_index(struct Scene *scene, +int BKE_modifiers_get_cage_index(const struct Scene *scene, struct Object *ob, int *r_lastPossibleCageIndex, bool is_virtual); @@ -469,8 +469,8 @@ struct Object *BKE_modifiers_is_deformed_by_lattice(struct Object *ob); struct Object *BKE_modifiers_is_deformed_by_curve(struct Object *ob); bool BKE_modifiers_uses_multires(struct Object *ob); bool BKE_modifiers_uses_armature(struct Object *ob, struct bArmature *arm); -bool BKE_modifiers_uses_subsurf_facedots(struct Scene *scene, struct Object *ob); -bool BKE_modifiers_is_correctable_deformed(struct Scene *scene, struct Object *ob); +bool BKE_modifiers_uses_subsurf_facedots(const struct Scene *scene, struct Object *ob); +bool BKE_modifiers_is_correctable_deformed(const struct Scene *scene, struct Object *ob); void BKE_modifier_free_temporary_data(struct ModifierData *md); typedef struct CDMaskLink { @@ -484,14 +484,14 @@ typedef struct CDMaskLink { * pointed to by md for correct evaluation, assuming the data indicated by * final_datamask is required at the end of the stack. */ -struct CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene, +struct CDMaskLink *BKE_modifier_calc_data_masks(const struct Scene *scene, struct Object *ob, struct ModifierData *md, struct CustomData_MeshMasks *final_datamask, int required_mode, ModifierData *previewmd, const struct CustomData_MeshMasks *previewmask); -struct ModifierData *BKE_modifier_get_last_preview(struct Scene *scene, +struct ModifierData *BKE_modifier_get_last_preview(const struct Scene *scene, struct ModifierData *md, int required_mode); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index a2a0bd84234..34b7c4234ec 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -464,7 +464,7 @@ void BKE_modifier_set_error(const Object *ob, ModifierData *md, const char *_for * then is NULL) * also used for some mesh tools to give warnings */ -int BKE_modifiers_get_cage_index(struct Scene *scene, +int BKE_modifiers_get_cage_index(const Scene *scene, Object *ob, int *r_lastPossibleCageIndex, bool is_virtual) @@ -587,7 +587,7 @@ bool BKE_modifier_is_nonlocal_in_liboverride(const Object *ob, const ModifierDat (md == NULL || (md->flag & eModifierFlag_OverrideLibrary_Local) == 0)); } -CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene, +CDMaskLink *BKE_modifier_calc_data_masks(const struct Scene *scene, Object *ob, ModifierData *md, CustomData_MeshMasks *final_datamask, @@ -655,7 +655,7 @@ CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene, return dataMasks; } -ModifierData *BKE_modifier_get_last_preview(struct Scene *scene, +ModifierData *BKE_modifier_get_last_preview(const struct Scene *scene, ModifierData *md, int required_mode) { @@ -878,7 +878,7 @@ bool BKE_modifiers_uses_armature(Object *ob, bArmature *arm) return false; } -bool BKE_modifiers_uses_subsurf_facedots(struct Scene *scene, Object *ob) +bool BKE_modifiers_uses_subsurf_facedots(const struct Scene *scene, Object *ob) { /* Search (backward) in the modifier stack to find if we have a subsurf modifier (enabled) before * the last modifier displayed on cage (or if the subsurf is the last). */ @@ -919,7 +919,7 @@ bool BKE_modifier_is_correctable_deformed(ModifierData *md) return mti->deformMatricesEM != NULL; } -bool BKE_modifiers_is_correctable_deformed(struct Scene *scene, Object *ob) +bool BKE_modifiers_is_correctable_deformed(const struct Scene *scene, Object *ob) { VirtualModifierData virtualModifierData; ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData); diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 1a1caa2943a..79fce24076e 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -1522,8 +1522,7 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph, } /* Meh loose Scene const correctness here. */ - const bool use_subsurf_fdots = scene ? BKE_modifiers_uses_subsurf_facedots((Scene *)scene, ob) : - false; + const bool use_subsurf_fdots = scene ? BKE_modifiers_uses_subsurf_facedots(scene, ob) : false; if (do_uvcage) { mesh_buffer_cache_create_requested(task_graph, -- cgit v1.2.3