[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35835] trunk/blender/source/blender: - quiet new warnings with gcc 4.6
Campbell Barton
ideasman42 at gmail.com
Mon Mar 28 04:34:56 CEST 2011
Revision: 35835
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35835
Author: campbellbarton
Date: 2011-03-28 02:34:55 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
- quiet new warnings with gcc 4.6
- use BLI math funcs for normal float/short conversion.
- correct some un-intentional float/double promotions.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/exotic.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/mesh/editface.c
trunk/blender/source/blender/editors/mesh/editmesh.c
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/makesrna/intern/rna_key.c
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_nla.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_rna.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -2570,11 +2570,9 @@
}
else
{
- int i=0;
- short * no = pMesh->mvert[indices[vert_index]].no;
- for(i=0; i<3; i++)
- fNorm[i]=no[i]/32767.0f;
- normalize_v3(fNorm);
+ short *no = pMesh->mvert[indices[vert_index]].no;
+ normal_short_to_float_v3(fNorm, no);
+ normalize_v3(fNorm); /* XXX, is this needed */
}
}
static void SetTSpace(const SMikkTSpaceContext * pContext, const float fvTangent[], const float fSign, const int face_num, const int iVert)
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -1604,9 +1604,7 @@
VECCOPY(mv->co, eve->co);
- mv->no[0] = eve->no[0] * 32767.0;
- mv->no[1] = eve->no[1] * 32767.0;
- mv->no[2] = eve->no[2] * 32767.0;
+ normal_float_to_short_v3(mv->no, eve->no);
mv->bweight = (unsigned char) (eve->bweight * 255.0f);
mv->flag = 0;
Modified: trunk/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/exotic.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/blenkernel/intern/exotic.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -182,12 +182,10 @@
v2= me->mvert+mface->v2;
v3= me->mvert+mface->v3;
v4= me->mvert+mface->v4;
-
+
normal_tri_v3( nor,v1->co, v2->co, v3->co);
- sno[0]= 32767.0*nor[0];
- sno[1]= 32767.0*nor[1];
- sno[2]= 32767.0*nor[2];
-
+ normal_float_to_short_v3(sno, nor);
+
simple_vertex_normal_blend(v1->no, sno);
simple_vertex_normal_blend(v2->no, sno);
simple_vertex_normal_blend(v3->no, sno);
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -751,9 +751,7 @@
verts= dl->verts;
while(a--) {
VECCOPY(mvert->co, verts);
- mvert->no[0]= (short int)(nors[0]*32767.0);
- mvert->no[1]= (short int)(nors[1]*32767.0);
- mvert->no[2]= (short int)(nors[2]*32767.0);
+ normal_float_to_short_v3(mvert->no, nors);
mvert++;
nors+= 3;
verts+= 3;
Modified: trunk/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/editors/gpencil/drawgpencil.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -516,7 +516,8 @@
/* draw grease-pencil datablock */
static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy, int cfra, int dflag)
{
- bGPDlayer *gpl, *actlay=NULL;
+ bGPDlayer *gpl;
+ // bGPDlayer *actlay=NULL; // UNUSED
/* reset line drawing style (in case previous user didn't reset) */
setlinestyle(0);
@@ -541,8 +542,8 @@
continue;
/* if layer is active one, store pointer to it */
- if (gpl->flag & GP_LAYER_ACTIVE)
- actlay= gpl;
+ // if (gpl->flag & GP_LAYER_ACTIVE)
+ // actlay= gpl;
/* get frame to draw */
gpf= gpencil_layer_getframe(gpl, cfra, 0);
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/editors/interface/interface.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -1913,7 +1913,7 @@
{
/* if something changed in the button */
double value;
- float okwidth;
+// float okwidth; // UNUSED
// int transopts= ui_translate_buttons();
ui_is_but_sel(but);
@@ -1967,7 +1967,7 @@
/* safety is 4 to enable small number buttons (like 'users') */
- okwidth= -4 + (but->x2 - but->x1);
+ // okwidth= -4 + (but->x2 - but->x1); // UNUSED
/* name: */
switch( but->type ) {
@@ -1989,8 +1989,8 @@
value= ui_get_but_val(but);
if(ui_is_but_float(but)) {
- if(value == FLT_MAX) sprintf(but->drawstr, "%sinf", but->str);
- else if(value == -FLT_MAX) sprintf(but->drawstr, "%s-inf", but->str);
+ if(value == (double) FLT_MAX) sprintf(but->drawstr, "%sinf", but->str);
+ else if(value == (double) -FLT_MAX) sprintf(but->drawstr, "%s-inf", but->str);
/* support length type buttons */
else if(ui_is_but_unit(but)) {
char new_str[sizeof(but->drawstr)];
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -3671,12 +3671,12 @@
static int ui_numedit_but_HISTOGRAM(uiBut *but, uiHandleButtonData *data, int mx, int my)
{
Histogram *hist = (Histogram *)but->poin;
- rcti rect;
+ /* rcti rect; */
int changed= 1;
float dx, dy, yfac=1.f;
- rect.xmin= but->x1; rect.xmax= but->x2;
- rect.ymin= but->y1; rect.ymax= but->y2;
+ /* rect.xmin= but->x1; rect.xmax= but->x2; */
+ /* rect.ymin= but->y1; rect.ymax= but->y2; */
dx = mx - data->draglastx;
dy = my - data->draglasty;
@@ -3754,12 +3754,12 @@
static int ui_numedit_but_WAVEFORM(uiBut *but, uiHandleButtonData *data, int mx, int my)
{
Scopes *scopes = (Scopes *)but->poin;
- rcti rect;
+ /* rcti rect; */
int changed= 1;
float dx, dy, yfac=1.f;
- rect.xmin= but->x1; rect.xmax= but->x2;
- rect.ymin= but->y1; rect.ymax= but->y2;
+ /* rect.xmin= but->x1; rect.xmax= but->x2; */
+ /* rect.ymin= but->y1; rect.ymax= but->y2; */
dx = mx - data->draglastx;
dy = my - data->draglasty;
@@ -3837,12 +3837,12 @@
static int ui_numedit_but_VECTORSCOPE(uiBut *but, uiHandleButtonData *data, int mx, int my)
{
Scopes *scopes = (Scopes *)but->poin;
- rcti rect;
+ /* rcti rect; */
int changed= 1;
/* float dx, dy; */
- rect.xmin= but->x1; rect.xmax= but->x2;
- rect.ymin= but->y1; rect.ymax= but->y2;
+ /* rect.xmin= but->x1; rect.xmax= but->x2; */
+ /* rect.ymin= but->y1; rect.ymax= but->y2; */
/* dx = mx - data->draglastx; */
/* dy = my - data->draglasty; */
Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -1097,6 +1097,7 @@
}*/
}
else if(event->type==PADPLUSKEY || event->type==PADMINUS) {
+#if 0 // XXX make float panel exception?
int zoom=0;
/* if panel is closed, only zoom if mouse is over the header */
@@ -1107,7 +1108,6 @@
else
zoom=1;
-#if 0 // XXX make float panel exception?
if(zoom) {
ScrArea *sa= CTX_wm_area(C);
SpaceLink *sl= sa->spacedata.first;
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -330,13 +330,13 @@
uiBut *but;
uiBlock *block;
PointerRNA idptr;
- ListBase *lb;
+ // ListBase *lb; // UNUSED
ID *id, *idfrom;
idptr= RNA_property_pointer_get(&template->ptr, template->prop);
id= idptr.data;
idfrom= template->ptr.id.data;
- lb= template->idlb;
+ // lb= template->idlb;
block= uiLayoutGetBlock(layout);
uiBlockBeginAlign(block);
@@ -920,7 +920,7 @@
PointerRNA ptr;
char typestr[32];
short proxy_protected, xco=0, yco=0;
- int rb_col;
+ // int rb_col; // UNUSED
/* get constraint typeinfo */
cti= constraint_get_typeinfo(con);
@@ -957,7 +957,7 @@
/* Draw constraint header */
/* rounded header */
- rb_col= (con->flag & CONSTRAINT_ACTIVE)?50:20;
+ // rb_col= (con->flag & CONSTRAINT_ACTIVE)?50:20; // UNUSED
/* open/close */
uiBlockSetEmboss(block, UI_EMBOSSN);
@@ -1442,6 +1442,7 @@
scopes->wavefrm_height= (scopes->wavefrm_height<=20)?20:scopes->wavefrm_height;
bt= uiDefBut(block, WAVEFORM, 0, "", rect.xmin, rect.ymin, rect.xmax-rect.xmin, scopes->wavefrm_height, scopes, 0, 0, 0, 0, "");
+ (void)bt; // UNUSED
MEM_freeN(cb);
}
@@ -2389,6 +2390,7 @@
uiLayout *ui_abs;
ui_abs= uiLayoutAbsolute(layout, 0);
+ (void)ui_abs; // UNUSED
uiDefIconBut(block, BUT, handle_event, ICON_PANEL_CLOSE,
0, UI_UNIT_Y*0.1, UI_UNIT_X*0.8, UI_UNIT_Y*0.8, NULL, 0.0f, 0.0f, 0, 0, "Stop this job");
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -2092,12 +2092,10 @@
float coord_array[LINK_RESOL+1][2];
if(ui_link_bezier_points(rect, coord_array, LINK_RESOL)) {
- float dist;
- int i;
-
/* we can reuse the dist variable here to increment the GL curve eval amount*/
- dist = 1.0f/(float)LINK_RESOL;
-
+ // const float dist= 1.0f/(float)LINK_RESOL; // UNUSED
+ int i;
+
glEnable(GL_BLEND);
glEnable(GL_LINE_SMOOTH);
Modified: trunk/blender/source/blender/editors/mesh/editface.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editface.c 2011-03-28 02:11:51 UTC (rev 35834)
+++ trunk/blender/source/blender/editors/mesh/editface.c 2011-03-28 02:34:55 UTC (rev 35835)
@@ -452,7 +452,7 @@
sub_v3_v3v3(d1, v->co, v1->co);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list