blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

Cleanup: remove redundant casts

This commit is contained in:
Campbell Barton 2020-06-13 15:49:59 +10:00
parent c5a0ce1ade
commit dd4071b379
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/gpencil_modifier.c
View File

@ -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 */

6
source/blender/makesdna/DNA_gpencil_modifier_types.h
View File

@ -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 {