Lots of mingw/gcc compiler warning fixes
This commit is contained in:
@@ -526,8 +526,6 @@ void pdDoEffectors(ListBase *lb, float *opco, float *force, float *speed, float
|
|||||||
Object *ob;
|
Object *ob;
|
||||||
pEffectorCache *ec;
|
pEffectorCache *ec;
|
||||||
PartDeflect *pd;
|
PartDeflect *pd;
|
||||||
float vect_to_vert[3];
|
|
||||||
float *obloc;
|
|
||||||
|
|
||||||
float distance, vec_to_part[3];
|
float distance, vec_to_part[3];
|
||||||
float falloff;
|
float falloff;
|
||||||
|
|||||||
@@ -2458,7 +2458,7 @@ static void precalc_effectors(Object *ob, ParticleSystem *psys, ParticleSystemMo
|
|||||||
ParticleSettings *part=psys->part;
|
ParticleSettings *part=psys->part;
|
||||||
ParticleData *pa;
|
ParticleData *pa;
|
||||||
float vec2[3],loc[3],*co=0;
|
float vec2[3],loc[3],*co=0;
|
||||||
int p,totpart,totvert;
|
int p,totpart;
|
||||||
|
|
||||||
for(ec= lb->first; ec; ec= ec->next) {
|
for(ec= lb->first; ec; ec= ec->next) {
|
||||||
PartDeflect *pd= ec->ob->pd;
|
PartDeflect *pd= ec->ob->pd;
|
||||||
@@ -2991,8 +2991,7 @@ static void particle_intersect_face(void *userdata, int index, const BVHTreeRay
|
|||||||
MFace *face = col->md->mfaces + index;
|
MFace *face = col->md->mfaces + index;
|
||||||
MVert *x = col->md->x;
|
MVert *x = col->md->x;
|
||||||
MVert *v = col->md->current_v;
|
MVert *v = col->md->current_v;
|
||||||
float dir[3], vel[3], co1[3], co2[3], uv[2], ipoint[3], temp[3], dist, t, threshold;
|
float vel[3], co1[3], co2[3], uv[2], ipoint[3], temp[3], t;
|
||||||
int ret=0;
|
|
||||||
|
|
||||||
float *t0, *t1, *t2, *t3;
|
float *t0, *t1, *t2, *t3;
|
||||||
t0 = x[ face->v1 ].co;
|
t0 = x[ face->v1 ].co;
|
||||||
@@ -3061,12 +3060,11 @@ static void particle_intersect_face(void *userdata, int index, const BVHTreeRay
|
|||||||
/* 1. check for all possible deflectors for closest intersection on particle path */
|
/* 1. check for all possible deflectors for closest intersection on particle path */
|
||||||
/* 2. if deflection was found kill the particle or calculate new coordinates */
|
/* 2. if deflection was found kill the particle or calculate new coordinates */
|
||||||
static void deflect_particle(Object *pob, ParticleSystemModifierData *psmd, ParticleSystem *psys, ParticleSettings *part, ParticleData *pa, int p, float timestep, float dfra, float cfra){
|
static void deflect_particle(Object *pob, ParticleSystemModifierData *psmd, ParticleSystem *psys, ParticleSettings *part, ParticleData *pa, int p, float timestep, float dfra, float cfra){
|
||||||
Object *ob;
|
Object *ob = NULL;
|
||||||
ListBase *lb=&psys->effectors;
|
ListBase *lb=&psys->effectors;
|
||||||
ParticleEffectorCache *ec;
|
ParticleEffectorCache *ec;
|
||||||
ParticleKey reaction_state;
|
ParticleKey reaction_state;
|
||||||
ParticleCollision col;
|
ParticleCollision col;
|
||||||
CollisionModifierData *collmd;
|
|
||||||
BVHTreeRayHit hit;
|
BVHTreeRayHit hit;
|
||||||
float ray_dir[3], zerovec[3]={0.0,0.0,0.0};
|
float ray_dir[3], zerovec[3]={0.0,0.0,0.0};
|
||||||
float radius = ((part->flag & PART_SIZE_DEFL)?pa->size:0.0f);
|
float radius = ((part->flag & PART_SIZE_DEFL)?pa->size:0.0f);
|
||||||
@@ -3114,7 +3112,6 @@ static void deflect_particle(Object *pob, ParticleSystemModifierData *psmd, Part
|
|||||||
int through = (BLI_frand() < pd->pdef_perm) ? 1 : 0;
|
int through = (BLI_frand() < pd->pdef_perm) ? 1 : 0;
|
||||||
float co[3]; /* point of collision */
|
float co[3]; /* point of collision */
|
||||||
float vec[3]; /* movement through collision */
|
float vec[3]; /* movement through collision */
|
||||||
float vel[3]; /* velocity after collision */
|
|
||||||
float t = hit.dist/col.ray_len; /* time of collision between this iteration */
|
float t = hit.dist/col.ray_len; /* time of collision between this iteration */
|
||||||
float dt = col.t + t * (1.0f - col.t); /* time of collision between frame change*/
|
float dt = col.t + t * (1.0f - col.t); /* time of collision between frame change*/
|
||||||
|
|
||||||
|
|||||||
@@ -3150,7 +3150,6 @@ static PyObject *Object_copyAllPropertiesTo( BPy_Object * self,
|
|||||||
PyObject *dest;
|
PyObject *dest;
|
||||||
Object *dest_ob;
|
Object *dest_ob;
|
||||||
bProperty *prop = NULL;
|
bProperty *prop = NULL;
|
||||||
bProperty *propn = NULL;
|
|
||||||
|
|
||||||
if( !PyArg_ParseTuple( args, "O!", &Object_Type, &dest ) )
|
if( !PyArg_ParseTuple( args, "O!", &Object_Type, &dest ) )
|
||||||
return EXPP_ReturnPyObjError( PyExc_TypeError,
|
return EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||||
|
|||||||
@@ -3013,7 +3013,6 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
|
|||||||
int need_orco=0, need_stress=0, need_nmap_tangent=0, need_tangent=0;
|
int need_orco=0, need_stress=0, need_nmap_tangent=0, need_tangent=0;
|
||||||
int a, a1, ok, vertofs;
|
int a, a1, ok, vertofs;
|
||||||
int end, do_autosmooth=0, totvert = 0;
|
int end, do_autosmooth=0, totvert = 0;
|
||||||
int useFluidmeshNormals= 0; // NT fluidsim, use smoothed normals?
|
|
||||||
int use_original_normals= 0;
|
int use_original_normals= 0;
|
||||||
|
|
||||||
me= ob->data;
|
me= ob->data;
|
||||||
|
|||||||
@@ -2942,14 +2942,6 @@ void buttons_ketsji(uiBlock *block, Object *ob)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void check_actor(void *arg1_but, void *arg2_object)
|
|
||||||
{
|
|
||||||
int *gameflag = arg2_object;
|
|
||||||
/* force enabled ACTOR for body >= dynamic */
|
|
||||||
if (*gameflag & OB_DYNAMIC)
|
|
||||||
*gameflag |= OB_ACTOR;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void check_body_type(void *arg1_but, void *arg2_object)
|
static void check_body_type(void *arg1_but, void *arg2_object)
|
||||||
{
|
{
|
||||||
Object *ob = arg2_object;
|
Object *ob = arg2_object;
|
||||||
@@ -3018,7 +3010,7 @@ static uiBlock *advanced_bullet_menu(void *arg_ob)
|
|||||||
if (ob->soft)
|
if (ob->soft)
|
||||||
{
|
{
|
||||||
|
|
||||||
uiDefButBitI(block, TOG, OB_SB_GOAL, 0, "Shape matching",
|
uiDefButBitS(block, TOG, OB_SB_GOAL, 0, "Shape matching",
|
||||||
xco+=120, yco, 118, 19, &ob->softflag, 0, 0, 0, 0,
|
xco+=120, yco, 118, 19, &ob->softflag, 0, 0, 0, 0,
|
||||||
"Enable soft body shape matching goal");
|
"Enable soft body shape matching goal");
|
||||||
yco -= 25;
|
yco -= 25;
|
||||||
|
|||||||
@@ -4960,7 +4960,7 @@ static void object_panel_particle_system(Object *ob)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* NT - Panel for fluidsim settings */
|
/* NT - Panel for fluidsim settings */
|
||||||
|
#ifndef DISABLE_ELBEEM
|
||||||
static int _can_fluidsim_at_all(Object *ob)
|
static int _can_fluidsim_at_all(Object *ob)
|
||||||
{
|
{
|
||||||
// list of Yes
|
// list of Yes
|
||||||
@@ -5006,6 +5006,7 @@ static void object_fluidsim__enabletoggle(void *ob_v, void *arg2)
|
|||||||
countall();
|
countall();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void object_panel_fluidsim(Object *ob)
|
static void object_panel_fluidsim(Object *ob)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3999,7 +3999,6 @@ static void drawnurb(Base *base, Nurb *nurb, int dt)
|
|||||||
BevPoint *bevp= (BevPoint *)(bl+1);
|
BevPoint *bevp= (BevPoint *)(bl+1);
|
||||||
int nr= bl->nr;
|
int nr= bl->nr;
|
||||||
int skip= nu->resolu/16;
|
int skip= nu->resolu/16;
|
||||||
float fac;
|
|
||||||
|
|
||||||
while (nr-->0) { /* accounts for empty bevel lists */
|
while (nr-->0) { /* accounts for empty bevel lists */
|
||||||
float ox,oy,oz; // Offset perpendicular to the curve
|
float ox,oy,oz; // Offset perpendicular to the curve
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ static int check_identifier(char ch);
|
|||||||
static int check_whitespace(char ch);
|
static int check_whitespace(char ch);
|
||||||
|
|
||||||
static int get_wrap_width(SpaceText *st);
|
static int get_wrap_width(SpaceText *st);
|
||||||
static int get_wrap_points(SpaceText *st, char *line);
|
//static int get_wrap_points(SpaceText *st, char *line);
|
||||||
static void get_suggest_prefix(Text *text, int offset);
|
static void get_suggest_prefix(Text *text, int offset);
|
||||||
static void confirm_suggestion(Text *text, int skipleft);
|
static void confirm_suggestion(Text *text, int skipleft);
|
||||||
|
|
||||||
@@ -278,6 +278,7 @@ static int find_specialvar(char *string)
|
|||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0 // not used
|
||||||
static void print_format(SpaceText *st, TextLine *line) {
|
static void print_format(SpaceText *st, TextLine *line) {
|
||||||
int i, a;
|
int i, a;
|
||||||
char *s, *f;
|
char *s, *f;
|
||||||
@@ -292,6 +293,7 @@ static void print_format(SpaceText *st, TextLine *line) {
|
|||||||
}
|
}
|
||||||
printf("\n%s [%#x]\n", line->format, (int) (f[strlen(f)+1]));
|
printf("\n%s [%#x]\n", line->format, (int) (f[strlen(f)+1]));
|
||||||
}
|
}
|
||||||
|
#endif // not used
|
||||||
|
|
||||||
/* Ensures the format string for the given line is long enough, reallocating as needed */
|
/* Ensures the format string for the given line is long enough, reallocating as needed */
|
||||||
static int check_format_len(TextLine *line, unsigned int len) {
|
static int check_format_len(TextLine *line, unsigned int len) {
|
||||||
@@ -684,6 +686,7 @@ static int get_wrap_width(SpaceText *st) {
|
|||||||
return max>8 ? max : 8;
|
return max>8 ? max : 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0 // not used
|
||||||
/* Returns the number of wrap points (or additional lines) in the given string */
|
/* Returns the number of wrap points (or additional lines) in the given string */
|
||||||
static int get_wrap_points(SpaceText *st, char *line) {
|
static int get_wrap_points(SpaceText *st, char *line) {
|
||||||
int start, end, taboffs, i, max, count;
|
int start, end, taboffs, i, max, count;
|
||||||
@@ -707,6 +710,7 @@ static int get_wrap_points(SpaceText *st, char *line) {
|
|||||||
}
|
}
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
#endif // not used
|
||||||
|
|
||||||
/* Sets (offl, offc) for transforming (line, curs) to its wrapped position */
|
/* Sets (offl, offc) for transforming (line, curs) to its wrapped position */
|
||||||
static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl, int *offc) {
|
static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl, int *offc) {
|
||||||
|
|||||||
@@ -88,6 +88,7 @@
|
|||||||
#include "BKE_multires.h"
|
#include "BKE_multires.h"
|
||||||
#include "BKE_node.h"
|
#include "BKE_node.h"
|
||||||
#include "BKE_pointcache.h"
|
#include "BKE_pointcache.h"
|
||||||
|
#include "BKE_property.h"
|
||||||
#include "BKE_scene.h"
|
#include "BKE_scene.h"
|
||||||
#include "BKE_sculpt.h"
|
#include "BKE_sculpt.h"
|
||||||
#include "BKE_texture.h"
|
#include "BKE_texture.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user