forked from bartvdbraak/blender
Quite some compiler warnings...
This commit is contained in:
parent
b8e96e70dc
commit
74a1123059
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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");
|
||||
|
Loading…
Reference in New Issue
Block a user