diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 16:51:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 16:51:17 +0400 |
| commit | 3882f7cde740ee0fd74b0da3ef7f6044d894df71 (patch) | |
| tree | c82afd5d7a0cb445152bdab0b01761bdfb9d1bc9 /source/blender/blenkernel | |
| parent | 91c2aa7b95a7681ec839c5f8fd91a89980bab99f (diff) | |
quiet some warnings and fix build error with strict casting rules.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 2a3d7182770..e3fcd39b391 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1810,9 +1810,11 @@ void CustomData_copy_data(const CustomData *source, CustomData *dest, dest_offset = dest_index * typeInfo->size; if (!src_data || !dest_data) { - printf("%s: warning null data for %s type (%p --> %p), skipping\n", - __func__, layerType_getName(source->layers[src_i].type), - (void *)src_data, (void *)dest_data); + if (src_data != NULL && dest_data != NULL) { + printf("%s: warning null data for %s type (%p --> %p), skipping\n", + __func__, layerType_getName(source->layers[src_i].type), + (void *)src_data, (void *)dest_data); + } continue; } diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index eca0c36c49c..9cd21cfd125 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2597,7 +2597,7 @@ static void dag_id_flush_update(Scene *sce, ID *id) MovieClip *clip = object_get_movieclip(sce, sce->camera, 1); if(clip) - dag_id_flush_update(sce, clip); + dag_id_flush_update(sce, &clip->id); } /* update editors */ diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index da8af1357ab..b8e4a7ff78d 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -45,7 +45,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm) { MVert *mv, *mvert; MEdge *me, *medge; - MPoly *mpoly, *mp; + MPoly /* *mpoly, */ /* UNUSED */ *mp; MLoop *mloop, *ml; BMVert *v, **vtable, **verts = NULL; BMEdge *e, **etable, **edges = NULL; @@ -53,7 +53,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm) BMIter liter; BLI_array_declare(verts); BLI_array_declare(edges); - int i, j, k, totvert, totedge, totface; + int i, j, k, totvert, totedge /* , totface */ /* UNUSED */ ; /*merge custom data layout*/ CustomData_bmesh_merge(&dm->vertData, &bm->vdata, CD_MASK_DERIVEDMESH, CD_CALLOC, bm, BM_VERT); @@ -63,7 +63,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm) totvert = dm->getNumVerts(dm); totedge = dm->getNumEdges(dm); - totface = dm->getNumPolys(dm); + /* totface = dm->getNumPolys(dm); */ /* UNUSED */ vtable = MEM_callocN(sizeof(void**) * totvert, "vert table in BMDM_Copy"); etable = MEM_callocN(sizeof(void**) * totedge, "edge table in BMDM_Copy"); @@ -93,7 +93,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm) MEM_freeN(medge); /*do faces*/ - mpoly = mp = dm->getPolyArray(dm); + /* mpoly = mp = dm->getPolyArray(dm); */ /* UNUSED */ mloop = dm->getLoopArray(dm); for (i = 0; i < dm->numPolyData; i++, mp++) { BMLoop *l; |