diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 07:28:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 07:28:46 +0400 |
| commit | 11947f1a67ab6fb26cc36e8f9c421d7e464a70c9 (patch) | |
| tree | af649270ea51d5f399bcafac2e0b92b9305be112 /source | |
| parent | 4e5c03f06ea0834bc6575b653924a1749891bf5f (diff) | |
pep/style edits & quiet some warnings
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_constraint.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 9b094d7f1f6..a9aeb37e478 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -656,7 +656,7 @@ static int ptcache_smoke_read(PTCacheFile *pf, void *smoke_v) return 1; } #else // WITH_SMOKE -static int ptcache_smoke_totpoint(void *UNUSED(smoke_v), int UNUSED(cfra)) { return 0; }; +static int ptcache_smoke_totpoint(void *UNUSED(smoke_v), int UNUSED(cfra)) { return 0; } static int ptcache_smoke_read(PTCacheFile *UNUSED(pf), void *UNUSED(smoke_v)) { return 0; } static int ptcache_smoke_write(PTCacheFile *UNUSED(pf), void *UNUSED(smoke_v)) { return 0; } #endif // WITH_SMOKE @@ -677,7 +677,7 @@ static int ptcache_dynamicpaint_write(PTCacheFile *pf, void *dp_v) int cache_compress = 1; /* version header */ - ptcache_file_write(pf, (void *)DPAINT_CACHE_VERSION, 1, sizeof(char)*4); + ptcache_file_write(pf, DPAINT_CACHE_VERSION, 1, sizeof(char)*4); if(surface->format != MOD_DPAINT_SURFACE_F_IMAGESEQ && surface->data) { int total_points=surface->data->total_points; diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 991ed0ebd51..0fbf5a8bd92 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -736,7 +736,7 @@ static int childof_set_inverse_exec (bContext *C, wmOperator *op) where_is_pose(scene, ob); } else if (ob) { - Object workob = {0}; + Object workob = {{0}}; /* use what_does_parent to find inverse - just like for normal parenting */ what_does_parent(scene, ob, &workob); |