[Bf-blender-cvs] [dd4071b379f] master: Cleanup: remove redundant casts
Campbell Barton
noreply at git.blender.org
Sat Jun 13 08:21:58 CEST 2020
Commit: dd4071b379f0b4024e7dc6ee987d5104ddf35fed
Author: Campbell Barton
Date: Sat Jun 13 15:49:59 2020 +1000
Branches: master
https://developer.blender.org/rBdd4071b379f0b4024e7dc6ee987d5104ddf35fed
Cleanup: remove redundant casts
===================================================================
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/makesdna/DNA_gpencil_modifier_types.h
===================================================================
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 {
More information about the Bf-blender-cvs
mailing list