diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-06-13 08:49:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-13 08:56:40 +0300 |
commit | dd4071b379f0b4024e7dc6ee987d5104ddf35fed (patch) | |
tree | 04aa71ea95ed28d3d012326d69db1b45977a96fa | |
parent | c5a0ce1ade6d3dbaf5a3614f2ecb1a8abf9fbe2a (diff) |
Cleanup: remove redundant casts
-rw-r--r-- | source/blender/blenkernel/intern/gpencil_modifier.c | 8 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_gpencil_modifier_types.h | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index 9e6fbf829b8..2f8500bd1df 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -286,11 +286,11 @@ void BKE_gpencil_lattice_init(Object *ob) return; } if (mmd->cache_data) { - BKE_lattice_deform_data_destroy((struct LatticeDeformData *)mmd->cache_data); + BKE_lattice_deform_data_destroy(mmd->cache_data); } /* init deform data */ - mmd->cache_data = (struct LatticeDeformData *)BKE_lattice_deform_data_create(latob, ob); + mmd->cache_data = BKE_lattice_deform_data_create(latob, ob); } } } @@ -303,7 +303,7 @@ void BKE_gpencil_lattice_clear(Object *ob) if (md->type == eGpencilModifierType_Lattice) { LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md; if ((mmd) && (mmd->cache_data)) { - BKE_lattice_deform_data_destroy((struct LatticeDeformData *)mmd->cache_data); + BKE_lattice_deform_data_destroy(mmd->cache_data); mmd->cache_data = NULL; } } @@ -859,7 +859,7 @@ void BKE_gpencil_prepare_eval_data(Depsgraph *depsgraph, Scene *scene, Object *o } ob->runtime.gpd_eval = gpencil_copy_for_eval(ob->runtime.gpd_orig); gpencil_assign_object_eval(ob); - BKE_gpencil_update_orig_pointers(ob_orig, (Object *)ob); + BKE_gpencil_update_orig_pointers(ob_orig, ob); } /* Calculate gpencil modifiers */ diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h index ea1c0f1fda0..674999ab465 100644 --- a/source/blender/makesdna/DNA_gpencil_modifier_types.h +++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h @@ -24,6 +24,8 @@ #include "DNA_defs.h" #include "DNA_listBase.h" +struct LatticeDeformData; + /* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE! * (ONLY ADD NEW ITEMS AT THE END) */ @@ -445,8 +447,8 @@ typedef struct LatticeGpencilModifierData { float strength; /** Custom index for passes. */ int layer_pass; - /** Runtime only (LatticeDeformData). */ - void *cache_data; + /** Runtime only. */ + struct LatticeDeformData *cache_data; } LatticeGpencilModifierData; typedef enum eLatticeGpencil_Flag { |