diff options
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 9ea8dde058f..61eb34349f9 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3805,7 +3805,7 @@ static void get_PTCacheUndo(PTCacheEdit *edit, PTCacheUndo *undo) LOOP_POINTS { LOOP_KEYS { - if((int)key->ftime == pm->frame) { + if((int)key->ftime == (int)pm->frame) { key->co = pm->cur[BPHYS_DATA_LOCATION]; key->vel = pm->cur[BPHYS_DATA_VELOCITY]; key->rot = pm->cur[BPHYS_DATA_ROTATION]; @@ -4029,7 +4029,7 @@ static void PE_create_particle_edit(Scene *scene, Object *ob, PointCache *cache, return; if(!edit) { - totpoint = psys ? psys->totpart : ((PTCacheMem*)cache->mem_cache.first)->totpoint; + totpoint = psys ? psys->totpart : (int)((PTCacheMem*)cache->mem_cache.first)->totpoint; edit= MEM_callocN(sizeof(PTCacheEdit), "PE_create_particle_edit"); edit->points=MEM_callocN(totpoint*sizeof(PTCacheEditPoint),"PTCacheEditPoints"); diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 93b0ca49915..b4a0f1edaad 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -1070,10 +1070,6 @@ static int fluidsimBake(bContext *UNUSED(C), ReportList *UNUSED(reports), Object return 0; } -static void fluidsimFreeBake(Object *UNUSED(ob)) -{ -} - #endif /* DISABLE_ELBEEM */ /***************************** Operators ******************************/ |