diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-12-17 20:22:08 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-12-17 20:22:08 +0400 |
commit | 74a112305932eff7c68c23c6df265e72de7195f8 (patch) | |
tree | 12c07cc90ce73199b2fdd499846a8ef6e946f7e8 /source/blender | |
parent | b8e96e70dc7997226cd06d3179572ab34e9756ad (diff) |
Quite some compiler warnings...
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index d4d83fec0eb..2cf2225607e 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -657,7 +657,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, float *nors= dm->getFaceDataArray(dm, CD_NORMAL); MTFace *tf = DM_get_face_data_layer(dm, CD_MTFACE); int i, j, orig, *index = DM_get_face_data_layer(dm, CD_ORIGINDEX); - int startFace = 0, lastFlag = 0xdeadbeef; + int startFace = 0 /*, lastFlag = 0xdeadbeef */ /* UNUSED */; MCol *mcol = dm->getFaceDataArray(dm, CD_WEIGHT_MCOL); if(!mcol) mcol = dm->getFaceDataArray(dm, CD_MCOL); @@ -776,7 +776,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, int next_actualFace= dm->drawObject->triangle_to_mface[0]; glShadeModel( GL_SMOOTH ); - lastFlag = 0; + /* lastFlag = 0; */ /* UNUSED */ for(i = 0; i < tottri; i++) { int actualFace = next_actualFace; int flag = 1; diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index f7f10276ee4..6fb4164d6c6 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -213,7 +213,7 @@ void defvert_normalize_lock(MDeformVert *dvert, const int def_nr_lock) dvert->dw[0].weight= 1.0f; } else { - MDeformWeight *dw_lock; + MDeformWeight *dw_lock = NULL; MDeformWeight *dw; unsigned int i; float tot_weight= 0.0f; diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index b592e078db3..955e747eded 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -3220,7 +3220,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, /* hit data */ float hitCoord[3]; int hitFace = -1; - short hitQuad; + short hitQuad = 0; /* Supersampling factor */ if (samples > 1 && surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) @@ -4647,7 +4647,7 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, Scene *sc #pragma omp parallel for schedule(static) for (index=0; index<sData->total_points; index++) { - float prev_point[3]; + float prev_point[3] = {0.0f, 0.0f, 0.0f}; if (do_velocity_data && !new_bdata) { copy_v3_v3(prev_point, bData->realCoord[bData->s_pos[index]].v); } diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 828ecb2d535..83adfa12236 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1154,7 +1154,7 @@ int BKE_tracking_next(MovieTrackingContext *context) #pragma omp parallel for private(a) shared(ibuf_new, ok) if(map_size>1) for(a= 0; a<map_size; a++) { - TrackContext *track_context; + TrackContext *track_context = NULL; MovieTrackingTrack *track; MovieTrackingMarker *marker; diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index e117a934cd7..bfb5d166e6f 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -892,7 +892,7 @@ static void moveCloserToDistanceFromPlane(Scene *scene, Object *ob, Mesh *me, in int totweight = dvert->totweight; float oldw = 0; float oldPos[3] = {0}; - float vc, hc, dist; + float vc, hc, dist = 0.0f; int i, k; float (*changes)[2] = MEM_mallocN(sizeof(float *)*totweight*2, "vertHorzChange"); float *dists = MEM_mallocN(sizeof(float)*totweight, "distance"); |