[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22790] branches/blender2.5/blender: 2. 5 - Warning cleanups (for mingw+scons)
Joshua Leung
aligorith at gmail.com
Wed Aug 26 02:38:43 CEST 2009
Revision: 22790
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22790
Author: aligorith
Date: 2009-08-26 02:38:43 +0200 (Wed, 26 Aug 2009)
Log Message:
-----------
2.5 - Warning cleanups (for mingw+scons)
Also, made the Outliner's horizontal scrollbar work better for keymaps view. It's still using an approximation of the width, but at least you can scroll now.
Modified Paths:
--------------
branches/blender2.5/blender/intern/smoke/extern/smoke_API.h
branches/blender2.5/blender/source/blender/blenkernel/intern/boids.c
branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c
branches/blender2.5/blender/source/blender/blenlib/BLI_voxel.h
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/makesdna/DNA_smoke_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_smoke.c
branches/blender2.5/blender/source/blender/render/intern/include/volume_precache.h
branches/blender2.5/blender/source/blender/render/intern/include/volumetric.h
branches/blender2.5/blender/source/blender/render/intern/source/pointdensity.c
branches/blender2.5/blender/source/blender/render/intern/source/volumetric.c
branches/blender2.5/blender/source/blender/render/intern/source/voxeldata.c
Modified: branches/blender2.5/blender/intern/smoke/extern/smoke_API.h
===================================================================
--- branches/blender2.5/blender/intern/smoke/extern/smoke_API.h 2009-08-25 23:46:00 UTC (rev 22789)
+++ branches/blender2.5/blender/intern/smoke/extern/smoke_API.h 2009-08-26 00:38:43 UTC (rev 22790)
@@ -32,6 +32,8 @@
extern "C" {
#endif
+struct FLUID_3D;
+
// export
void smoke_export(struct FLUID_3D *fluid, float *dt, float *dx, float **dens, float **densold, float **heat, float **heatold, float **vx, float **vy, float **vz, float **vxold, float **vyold, float **vzold, unsigned char **obstacles);
@@ -74,4 +76,4 @@
}
#endif
-#endif /* SMOKE_API_H_ */
\ No newline at end of file
+#endif /* SMOKE_API_H_ */
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/boids.c 2009-08-25 23:46:00 UTC (rev 22789)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/boids.c 2009-08-26 00:38:43 UTC (rev 22790)
@@ -76,7 +76,7 @@
Object *priority_ob = NULL;
float vec[3] = {0.0f, 0.0f, 0.0f}, loc[3] = {0.0f, 0.0f, 0.0f};
float mul = (rule->type == eBoidRuleType_Avoid ? 1.0 : -1.0);
- float priority = 0.0f, len;
+ float priority = 0.0f, len = 0.0f;
int ret = 0;
/* first find out goal/predator with highest priority */
@@ -614,7 +614,7 @@
KDTreeNearest *ptn = NULL;
ParticleTarget *pt;
ParticleData *epars;
- ParticleData *enemy_pa;
+ ParticleData *enemy_pa = NULL;
/* friends & enemies */
float closest_enemy[3] = {0.0f,0.0f,0.0f};
float closest_dist = fbr->distance + 1.0f;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/object.c 2009-08-25 23:46:00 UTC (rev 22789)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/object.c 2009-08-26 00:38:43 UTC (rev 22790)
@@ -2571,6 +2571,7 @@
return i;
}
+#if 0
static int pc_findindex(ListBase *listbase, int index)
{
LinkData *link= NULL;
@@ -2590,11 +2591,10 @@
return -1;
}
-#if 0
void object_delete_ptcache(Object *ob, int index)
{
int list_index = pc_findindex(&ob->pc_ids, index);
LinkData *link = BLI_findlink(&ob->pc_ids, list_index);
BLI_freelinkN(&ob->pc_ids, link);
}
-#endif
\ No newline at end of file
+#endif
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c 2009-08-25 23:46:00 UTC (rev 22789)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c 2009-08-26 00:38:43 UTC (rev 22790)
@@ -3238,7 +3238,7 @@
ParticleCollision col;
BVHTreeRayHit hit;
float ray_dir[3], zerovec[3]={0.0,0.0,0.0};
- float radius = ((part->flag & PART_SIZE_DEFL)?pa->size:0.0f), boid_z;
+ float radius = ((part->flag & PART_SIZE_DEFL)?pa->size:0.0f), boid_z = 0.0f;
int deflections=0, max_deflections=10;
VECCOPY(col.co1, pa->prev_state.co);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c 2009-08-25 23:46:00 UTC (rev 22789)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c 2009-08-26 00:38:43 UTC (rev 22790)
@@ -424,8 +424,6 @@
void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *psys)
{
- ParticleSystemModifierData *psmd= psys_get_modifier(ob, psys);
-
memset(pid, 0, sizeof(PTCacheID));
pid->ob= ob;
@@ -484,7 +482,7 @@
static int ptcache_compress_write(PTCacheFile *pf, unsigned char *in, unsigned int in_len, unsigned char *out, int mode)
{
- int r;
+ int r = 0;
unsigned char compressed;
LZO_HEAP_ALLOC(wrkmem, LZO1X_MEM_COMPRESS);
unsigned int out_len = LZO_OUT_LEN(in_len);
@@ -566,11 +564,12 @@
return 0;
}
+/*
static int ptcache_write_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
{
SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
SmokeDomainSettings *sds = smd->domain;
- /*
+
if(sds->wt) {
unsigned int res_big[3];
size_t res = sds->res[0]*sds->res[1]*sds->res[2];
@@ -599,16 +598,16 @@
return 1;
}
-*/
return 0;
}
+*/
// forward decleration
static int ptcache_file_read(PTCacheFile *pf, void *f, size_t tot, int size);
static int ptcache_compress_read(PTCacheFile *pf, unsigned char *result, unsigned int len)
{
- int r;
+ int r = 0;
unsigned char compressed = 0;
unsigned int in_len;
unsigned int out_len = len;
@@ -673,11 +672,12 @@
}
}
+/*
static void ptcache_read_smoke_turbulence(PTCacheFile *pf, void *smoke_v)
{
SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
SmokeDomainSettings *sds = smd->domain;
- /*
+
if(sds->fluid) {
unsigned int res[3];
float *dens, *densold, *tcu, *tcv, *tcw;
@@ -690,8 +690,8 @@
ptcache_compress_read(pf, (unsigned char*)dens, out_len);
}
- */
}
+*/
void BKE_ptcache_id_from_smoke(PTCacheID *pid, struct Object *ob, struct SmokeModifierData *smd)
{
@@ -1162,7 +1162,7 @@
int cfra1 = 0, cfra2 = 0;
int totpoint = 0, totpoint2 = 0;
int *index = &i, *index2 = &i;
- int use_old = 0, old_frame;
+ int use_old = 0, old_frame = 0;
int ret = 0, error = 0;
@@ -2084,7 +2084,7 @@
Base *base;
ListBase pidlist;
PTCacheID *pid = baker->pid;
- PointCache *cache;
+ PointCache *cache = NULL;
float frameleno = scene->r.framelen;
int cfrao = CFRA;
int startframe = MAXFRAME;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c 2009-08-25 23:46:00 UTC (rev 22789)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c 2009-08-26 00:38:43 UTC (rev 22790)
@@ -92,10 +92,10 @@
{
QueryPerformanceCounter ( &liCurrentTime );
}
-static double tval()
-{
- return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart ));
-}
+//static double tval()
+//{
+// return ((double)( (liCurrentTime.QuadPart - liStartTime.QuadPart)* (double)1000.0/(double)liFrequency.QuadPart ));
+//}
#else
#include <sys/time.h>
static struct timeval _tstart, _tend;
@@ -788,9 +788,8 @@
}
else if(smd->type & MOD_SMOKE_TYPE_DOMAIN)
{
- PointCache *cache, *cache_wt;
+ PointCache *cache;
PTCacheID pid;
- PTCacheID pid_wt;
float timescale;
int cache_result = 0;
int startframe, endframe, framenr;
@@ -1424,7 +1423,6 @@
{
int x, y, z;
float bv[6];
- float bigfactor = 1.0;
// x
bv[0] = p0[0];
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c 2009-08-25 23:46:00 UTC (rev 22789)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c 2009-08-26 00:38:43 UTC (rev 22790)
@@ -750,7 +750,7 @@
void autotexname(Tex *tex)
{
- char texstr[20][12]= {"None" , "Clouds" , "Wood", "Marble", "Magic" , "Blend",
+ char texstr[20][15]= {"None" , "Clouds" , "Wood", "Marble", "Magic" , "Blend",
"Stucci", "Noise" , "Image", "Plugin", "EnvMap" , "Musgrave",
"Voronoi", "DistNoise", "Point Density", "Voxel Data", "", "", "", ""};
Image *ima;
Modified: branches/blender2.5/blender/source/blender/blenlib/BLI_voxel.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/BLI_voxel.h 2009-08-25 23:46:00 UTC (rev 22789)
+++ branches/blender2.5/blender/source/blender/blenlib/BLI_voxel.h 2009-08-26 00:38:43 UTC (rev 22790)
@@ -37,4 +37,4 @@
float voxel_sample_trilinear(float *data, int *res, float *co);
float voxel_sample_tricubic(float *data, int *res, float *co);
-#endif /* BLI_VOXEL_H */
\ No newline at end of file
+#endif /* BLI_VOXEL_H */
Modified: branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c 2009-08-25 23:46:00 UTC (rev 22789)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c 2009-08-26 00:38:43 UTC (rev 22790)
@@ -127,11 +127,11 @@
{
BezTriple *newbezt;
int i;
-
- if (fcu == NULL)
+
+ /* this can only work when there is an F-Curve, and also when there are some BezTriples */
+ if ELEM(NULL, fcu, fcu->bezt)
return;
- // XXX this does not take into account sample data...
for (i=0; i < fcu->totvert; i++) {
/* If a key is selected */
if (fcu->bezt[i].f2 & SELECT) {
@@ -160,7 +160,7 @@
/* **************************************************** */
/* Various Tools */
-/* Basic IPO-Curve 'cleanup' function that removes 'double points' and unnecessary keyframes on linear-segments only */
+/* Basic F-Curve 'cleanup' function that removes 'double points' and unnecessary keyframes on linear-segments only */
void clean_fcurve(FCurve *fcu, float thresh)
{
BezTriple *old_bezts, *bezt, *beztn;
@@ -285,74 +285,74 @@
}
}
- /* if any points were selected, allocate tSmooth_Bezt points to work on */
- if (totSel >= 3) {
- tSmooth_Bezt *tarray, *tsb;
+ /* if any points were selected, allocate tSmooth_Bezt points to work on */
+ if (totSel >= 3) {
+ tSmooth_Bezt *tarray, *tsb;
+
+ /* allocate memory in one go */
+ tsb= tarray= MEM_callocN(totSel*sizeof(tSmooth_Bezt), "tSmooth_Bezt Array");
+
+ /* populate tarray with data of selected points */
+ bezt= fcu->bezt;
+ for (i=0, x=0; (i < fcu->totvert) && (x < totSel); i++, bezt++) {
+ if (BEZSELECTED(bezt)) {
+ /* tsb simply needs pointer to vec, and index */
+ tsb->h1 = &bezt->vec[0][1];
+ tsb->h2 = &bezt->vec[1][1];
+ tsb->h3 = &bezt->vec[2][1];
+
+ /* advance to the next tsb to populate */
+ if (x < totSel- 1)
+ tsb++;
+ else
+ break;
+ }
+ }
- /* allocate memory in one go */
- tsb= tarray= MEM_callocN(totSel*sizeof(tSmooth_Bezt), "tSmooth_Bezt Array");
-
- /* populate tarray with data of selected points */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list