Revision: 24038
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24038
Author: aligorith
Date: 2009-10-21 12:56:31 +0200 (Wed, 21 Oct 2009)
Log Message:
-----------
Silencing some compiler warnings for mingw
* Unused functions
* Uninitialised vars
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_physics.h
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/physics/particle_object.c
trunk/blender/source/blender/editors/physics/physics_intern.h
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_console/console_ops.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
Modified: trunk/blender/source/blender/editors/include/ED_physics.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_physics.h 2009-10-21
10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/include/ED_physics.h 2009-10-21
10:56:31 UTC (rev 24038)
@@ -32,6 +32,11 @@
struct wmKeyConfig;
+/* particle_edit.c */
+int PE_poll(struct bContext *C);
+int PE_hair_poll(struct bContext *C);
+int PE_poll_3dview(struct bContext *C);
+
/* operators */
void ED_operatortypes_physics(void);
void ED_keymap_physics(struct wmKeyConfig *keyconf);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c 2009-10-21
10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c 2009-10-21
10:56:31 UTC (rev 24038)
@@ -1311,7 +1311,7 @@
int subdiv, float dia, float depth, int ext, int fill)
{
Object *obedit= CTX_data_edit_object(C);
- int newob;
+ int newob = 0;
float mat[4][4];
if(obedit==NULL || obedit->type!=OB_MESH) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2009-10-21
10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2009-10-21
10:56:31 UTC (rev 24038)
@@ -4240,7 +4240,6 @@
static int smooth_vertex(bContext *C, wmOperator *op)
{
- ToolSettings *ts= CTX_data_tool_settings(C);
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
EditVert *eve, *eve_mir = NULL;
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c
2009-10-21 10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c
2009-10-21 10:56:31 UTC (rev 24038)
@@ -851,7 +851,7 @@
ParticleSystemModifierData *psmd;
POINT_P; KEY_K;
int index;
- float *vec, *nor, dvec[3], dot, dist_1st;
+ float *vec, *nor, dvec[3], dot, dist_1st=0.0f;
float hairimat[4][4], hairmat[4][4];
if(edit==NULL || edit->psys==NULL || (pset->flag &
PE_DEFLECT_EMITTER)==0 || (edit->psys->flag & PSYS_GLOBAL_HAIR))
@@ -2819,7 +2819,7 @@
PTCacheEditPoint *point = edit->points + point_index;
KEY_K;
float mat[4][4], imat[4][4];
- float lastco[3], rootco[3], co[3], nor[3], kco[3], dco[3], fac, length;
+ float lastco[3], rootco[3], co[3], nor[3], kco[3], dco[3], fac=0.0f,
length=0.0f;
if(psys && !(psys->flag & PSYS_GLOBAL_HAIR)) {
psys_mat_hair_to_global(data->ob, data->dm, psys->part->from,
psys->particles + point_index, mat);
Modified: trunk/blender/source/blender/editors/physics/particle_object.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_object.c
2009-10-21 10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/physics/particle_object.c
2009-10-21 10:56:31 UTC (rev 24038)
@@ -601,7 +601,7 @@
ParticleData *pa;
PTCacheEdit *edit;
PTCacheEditPoint *point;
- PTCacheEditKey *ekey;
+ PTCacheEditKey *ekey = NULL;
HairKey *key;
BVHTreeFromMesh bvhtree;
BVHTreeNearest nearest;
Modified: trunk/blender/source/blender/editors/physics/physics_intern.h
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_intern.h
2009-10-21 10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/physics/physics_intern.h
2009-10-21 10:56:31 UTC (rev 24038)
@@ -36,10 +36,6 @@
struct wmOperatorType;
/* particle_edit.c */
-int PE_poll(struct bContext *C);
-int PE_hair_poll(struct bContext *C);
-int PE_poll_3dview(struct bContext *C);
-
void PARTICLE_OT_select_all_toggle(struct wmOperatorType *ot);
void PARTICLE_OT_select_first(struct wmOperatorType *ot);
void PARTICLE_OT_select_last(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2009-10-21
10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2009-10-21
10:56:31 UTC (rev 24038)
@@ -2520,7 +2520,7 @@
{
wmWindowManager *wm= CTX_wm_manager(C);
wmWindow *win;
- ScrArea *sa;
+ ScrArea *sa = NULL;
SpaceImage *sima;
/* find an imagewindow showing render result */
Modified: trunk/blender/source/blender/editors/space_console/console_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_ops.c
2009-10-21 10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/space_console/console_ops.c
2009-10-21 10:56:31 UTC (rev 24038)
@@ -135,6 +135,7 @@
return cl->line[cl->cursor-1];
}
+#if 0 // XXX unused
static char cursor_char_next(ConsoleLine *cl)
{
/* assume cursor is clamped */
@@ -159,8 +160,10 @@
{
SpaceConsole *sc= CTX_wm_space_console(C);
+
console_lb_debug__internal(&sc->history);
}
+#endif
static ConsoleLine *console_lb_add__internal(ListBase *lb, ConsoleLine *from)
{
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2009-10-21
10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2009-10-21
10:56:31 UTC (rev 24038)
@@ -1077,35 +1077,7 @@
}
}
-static void node_blur_relative_cb(bContext *C, void *node, void *poin2)
-{
- bNode *nodev= node;
- NodeBlurData *nbd= nodev->storage;
- if(nbd->image_in_width != 0){
- if(nbd->relative){ /* convert absolute values to relative */
- nbd->percentx= (float)(nbd->sizex)/nbd->image_in_width;
- nbd->percenty= (float)(nbd->sizey)/nbd->image_in_height;
- }else{ /* convert relative values to absolute */
- nbd->sizex= (int)(nbd->percentx*nbd->image_in_width);
- nbd->sizey= (int)(nbd->percenty*nbd->image_in_height);
- }
- }
- // allqueue(REDRAWNODE, 0);
-}
-static void node_blur_update_sizex_cb(bContext *C, void *node, void *poin2)
-{
- bNode *nodev= node;
- NodeBlurData *nbd= nodev->storage;
- nbd->sizex= (int)(nbd->percentx*nbd->image_in_width);
-}
-static void node_blur_update_sizey_cb(bContext *C, void *node, void *poin2)
-{
- bNode *nodev= node;
- NodeBlurData *nbd= nodev->storage;
-
- nbd->sizey= (int)(nbd->percenty*nbd->image_in_height);
-}
static void node_composit_buts_blur(uiLayout *layout, PointerRNA *ptr)
{
uiLayout *col;
Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c
2009-10-21 10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c
2009-10-21 10:56:31 UTC (rev 24038)
@@ -3771,9 +3771,8 @@
}
/* only if ID and path were set, should we perform any
actions */
- // FIXME: if whole array flag is set, mus add the
entire array
if (id && path) {
- int arraylen, i;
+ int arraylen;
/* array checks */
if (flag & KSP_FLAG_WHOLE_ARRAY) {
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2009-10-21 10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2009-10-21 10:56:31 UTC (rev 24038)
@@ -4157,7 +4157,7 @@
PTCacheEditKey *key;
ParticleEditSettings *pset = PE_settings(scene);
int i, k, totpoint = edit->totpoint, timed = pset->flag & PE_FADE_TIME
? pset->fade_frames : 0;
- int steps;
+ int steps=1;
char nosel[4], sel[4];
float sel_col[3];
float nosel_col[3];
Modified: trunk/blender/source/blender/editors/space_view3d/drawvolume.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawvolume.c
2009-10-21 10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/space_view3d/drawvolume.c
2009-10-21 10:56:31 UTC (rev 24038)
@@ -217,7 +217,7 @@
RegionView3D *rv3d= ar->regiondata;
float viewnormal[3];
- int i, j, n, good_index, count = 0;
+ int i, j, n, good_index;
float d, d0, dd, ds;
float *points = NULL;
int numpoints = 0;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
2009-10-21 10:36:46 UTC (rev 24037)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
2009-10-21 10:56:31 UTC (rev 24038)
@@ -1300,6 +1300,7 @@
}
#endif
+#if 0 // XXX not used
static void delete_sketch_armature(bContext *C, void *arg1, void *arg2)
{
BIF_deleteSketch(C);
@@ -1316,6 +1317,7 @@
BIF_setTemplate(C, index);
}
+
static int view3d_panel_bonesketch_spaces_poll(const bContext *C, PanelType
*pt)
{
Object *obedit = CTX_data_edit_object(C);
@@ -1432,8 +1434,6 @@
uiBlockEndAlign(block);
}
-#if 0 // XXX not used
-
/* op->invoke */
static void redo_cb(bContext *C, void *arg_op, void *arg2)
{
@@ -1496,26 +1496,7 @@
strcpy(pt->label, "Grease Pencil");
pt->draw= gpencil_panel_standard;
BLI_addtail(&art->paneltypes, pt);
-/*
- pt= MEM_callocN(sizeof(PanelType), "spacetype view3d panel properties");
- strcpy(pt->idname, "VIEW3D_PT_properties");
- strcpy(pt->label, "View Properties");
- pt->draw= view3d_panel_properties;
- BLI_addtail(&art->paneltypes, pt);
-
- pt= MEM_callocN(sizeof(PanelType), "spacetype view3d panel transform
spaces");
- strcpy(pt->idname, "VIEW3D_PT_transform spaces");
- strcpy(pt->label, "Transform Orientations");
- pt->draw= view3d_panel_transform_spaces;
- BLI_addtail(&art->paneltypes, pt);
-
- pt= MEM_callocN(sizeof(PanelType), "spacetype view3d panel bonesketch
spaces");
- strcpy(pt->idname, "VIEW3D_PT_bonesketch_spaces");
- strcpy(pt->label, "Bone Sketching");
- pt->draw= view3d_panel_bonesketch_spaces;
- pt->poll= view3d_panel_bonesketch_spaces_poll;
- BLI_addtail(&art->paneltypes, pt);
-*/
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
