Revision: 21617
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21617
Author: aligorith
Date: 2009-07-16 06:45:52 +0200 (Thu, 16 Jul 2009)
Log Message:
-----------
2.5 - Silencing various compiler warnings (mingw)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature_retarget.c
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_edit.c
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
branches/blender2.5/blender/source/blender/editors/physics/editparticle.c
branches/blender2.5/blender/source/blender/editors/preview/previewrender.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/blender2.5/blender/source/blender/editors/space_file/filesel.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_view.c
branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
branches/blender2.5/blender/source/blender/editors/transform/transform_manipulator.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_particle.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_subwindow.c
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2009-07-16 04:44:38 UTC (rev 21616)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -4858,7 +4858,7 @@
}
else if(sl->spacetype==SPACE_CONSOLE) {
SpaceConsole *sconsole= (SpaceConsole *)sl;
- ConsoleLine *cl;
+ //ConsoleLine *cl;
link_list(fd, &sconsole->scrollback);
link_list(fd, &sconsole->history);
Modified:
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
2009-07-16 04:44:38 UTC (rev 21616)
+++
branches/blender2.5/blender/source/blender/editors/animation/keyframes_general.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -43,6 +43,8 @@
#include "DNA_space_types.h"
#include "DNA_scene_types.h"
+#include "RNA_access.h"
+
#include "BKE_action.h"
#include "BKE_fcurve.h"
#include "BKE_key.h"
@@ -52,8 +54,6 @@
#include "ED_keyframing.h"
#include "ED_keyframes_edit.h"
-#include "RNA_access.h"
-
/* This file contains code for various keyframe-editing tools which are
'destructive'
* (i.e. they will modify the order of the keyframes, and change the size of
the array).
* While some of these tools may eventually be moved out into blenkernel, for
now, it is
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature_retarget.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/armature/editarmature_retarget.c
2009-07-16 04:44:38 UTC (rev 21616)
+++
branches/blender2.5/blender/source/blender/editors/armature/editarmature_retarget.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -2139,15 +2139,15 @@
MemoNode *min_node = NULL;
float *vec0 = vec_cache[previous];
float *vec1 = vec_cache[current];
- float min_weight;
- int min_next;
+ float min_weight= 0.0f;
+ int min_next= 0;
int next;
for (next = current + 1; next <= nb_positions - (joints_left -
1); next++)
{
MemoNode *next_node;
float *vec2 = vec_cache[next];
- float weight = 0;
+ float weight = 0.0f;
/* ADD WEIGHT OF PREVIOUS - CURRENT - NEXT triple */
weight = calcCostAngleLengthDistance(iter, vec_cache,
edge, vec0, vec1, vec2, current, next, angle_weight, length_weight,
distance_weight);
@@ -2824,7 +2824,7 @@
ReebGraph *reebg;
double start_time, end_time;
double gstart_time, gend_time;
- double reeb_time, rig_time, retarget_time, total_time;
+ double reeb_time, rig_time=0.0, retarget_time=0.0, total_time;
gstart_time = start_time = PIL_check_seconds_timer();
Modified:
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_edit.c
2009-07-16 04:44:38 UTC (rev 21616)
+++ branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_edit.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -322,7 +322,7 @@
}
else {
short mval[2];
- int mx, my;
+ int mx=0, my=0;
float *fp= give_cursor(NULL, NULL); // XXX should be scene, v3d
float dvec[3];
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
2009-07-16 04:44:38 UTC (rev 21616)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -170,6 +170,8 @@
uiItemL(uiLayoutColumn(split, 0), name, 0);
col= uiLayoutColumn(split, 0);
}
+ else
+ col= NULL;
/* temp hack to show normal button for spin/screw */
if(strcmp(name, "Axis")==0) {
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
2009-07-16 04:44:38 UTC (rev 21616)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -1438,7 +1438,7 @@
{
int a;
float h,s,v;
- float dx, dy, sx1, sx2, sy, x, y;
+ float dx, dy, sx1, sx2, sy, x=0.0f, y=0.0f;
float col0[4][3]; // left half, rect bottom to top
float col1[4][3]; // right half, rect bottom to top
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
2009-07-16 04:44:38 UTC (rev 21616)
+++ branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -230,8 +230,8 @@
bDeformGroup *dg, *cdg;
char name[32], s[32];
MDeformWeight *org, *cpy;
- MDeformVert *dvert, *dvert_array;
- int i, idg, icdg, dvert_tot;
+ MDeformVert *dvert, *dvert_array=NULL;
+ int i, idg, icdg, dvert_tot=0;
if (ob->type != OB_MESH && ob->type != OB_LATTICE)
return;
@@ -353,9 +353,8 @@
void del_defgroup_in_object_mode ( Object *ob )
{
bDeformGroup *dg;
- MDeformVert *dvert_array, *dvert;
-
- int i, e, dvert_tot;
+ MDeformVert *dvert, *dvert_array=NULL;
+ int i, e, dvert_tot=0;
if ((!ob) || (ob->type != OB_MESH && ob->type != OB_LATTICE))
return;
Modified:
branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
2009-07-16 04:44:38 UTC (rev 21616)
+++ branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -93,6 +93,9 @@
#include "WM_api.h"
#include "WM_types.h"
+/* enable/disable overall compilation */
+#ifndef DISABLE_ELBEEM
+
/* XXX */
/* from header info.c */
static int start_progress_bar(void) {return 0;};
@@ -121,10 +124,6 @@
"INVALID" /* end */
};
-/* enable/disable overall compilation */
-#ifndef DISABLE_ELBEEM
-
-
/* ********************** fluid sim settings struct functions
********************** */
/* helper function */
Modified:
branches/blender2.5/blender/source/blender/editors/physics/editparticle.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/physics/editparticle.c
2009-07-16 04:44:38 UTC (rev 21616)
+++ branches/blender2.5/blender/source/blender/editors/physics/editparticle.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -2282,7 +2282,7 @@
ParticleEditSettings *pset= PE_settings(CTX_data_scene(C));
ParticleBrushData *brush;
int mode = RNA_enum_get(op->ptr, "mode");
- float original_value;
+ float original_value=1.0f;
if(pset->brushtype < 0)
return OPERATOR_CANCELLED;
@@ -3570,7 +3570,7 @@
ParticleEdit *edit= 0;
ParticleUndo *undo;
DynStr *ds;
- short event;
+ short event=0;
char *menu;
if(!PE_can_edit(psys)) return;
Modified:
branches/blender2.5/blender/source/blender/editors/preview/previewrender.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/preview/previewrender.c
2009-07-16 04:44:38 UTC (rev 21616)
+++ branches/blender2.5/blender/source/blender/editors/preview/previewrender.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -453,7 +453,7 @@
// ScrArea *sa= NULL; // XXX
// View3D *v3d= NULL; // XXX
RenderLayer *rl;
- int ofsx, ofsy;
+ int ofsx=0, ofsy=0;
if(renrect) return;
@@ -576,7 +576,7 @@
View3D *v3d= sa->spacedata.first;
RegionView3D *rv3d= NULL; // XXX
Render *re;
- RenderInfo *ri; /* preview struct! */
+ RenderInfo *ri=NULL; /* preview struct! */
RenderStats *rstats;
RenderData rdata;
rctf viewplane;
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2009-07-16 04:44:38 UTC (rev 21616)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -2337,6 +2337,7 @@
return sa;
}
+#if 0 // XXX not used
static ScrArea *find_empty_image_area(bContext *C)
{
bScreen *sc= CTX_wm_screen(C);
@@ -2353,6 +2354,7 @@
}
return sa;
}
+#endif // XXX not used
static void screen_set_image_output(bContext *C)
{
Modified:
branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_image.c
2009-07-16 04:44:38 UTC (rev 21616)
+++
branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_image.c
2009-07-16 04:45:52 UTC (rev 21617)
@@ -2763,7 +2763,7 @@
static void project_bucket_init(const ProjPaintState *ps, const int
thread_index, const int bucket_index, rctf *bucket_bounds)
{
LinkNode *node;
- int face_index, image_index;
+ int face_index, image_index=0;
ImBuf *ibuf = NULL;
MTFace *tf;
@@ -2820,7 +2820,7 @@
/* TODO - replace this with a tricker method that uses sideofline for
all screenCoords's edges against the closest bucket corner */
rctf bucket_bounds;
float p1[2], p2[2], p3[2], p4[2];
- float *v, *v1,*v2,*v3,*v4;
+ float *v, *v1,*v2,*v3,*v4=NULL;
int fidx;
project_bucket_bounds(ps, bucket_x, bucket_y, &bucket_bounds);
@@ -3194,7 +3194,7 @@
if (tf->tpage && ((G.f & G_FACESELECT)==0 || mf->flag &
ME_FACE_SEL)) {
- float *v1coSS, *v2coSS, *v3coSS, *v4coSS;
+ float *v1coSS, *v2coSS, *v3coSS, *v4coSS=NULL;
v1coSS = ps->screenCoords[mf->v1];
v2coSS = ps->screenCoords[mf->v2];
@@ -3339,7 +3339,7 @@
/* context */
ProjPaintImage *last_projIma;
int last_image_index = -1;
- int last_tile_width;
+ int last_tile_width=0;
for(a=0, last_projIma=ps->projImages; a < ps->image_tot; a++,
last_projIma++) {
int size = sizeof(UndoTile **) *
IMAPAINT_TILE_NUMBER(last_projIma->ibuf->x) *
IMAPAINT_TILE_NUMBER(last_projIma->ibuf->y);
@@ -3703,7 +3703,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
