Revision: 36312
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36312
Author: campbellbarton
Date: 2011-04-24 10:51:45 +0000 (Sun, 24 Apr 2011)
Log Message:
-----------
harmless changes to quiet clang static check warnings.
- made EXPANDED_AGRP take bAnimContext as an argument.
- remove unneeded NULL check drawFacesColored functions.
- comment some vars which are set but not used.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/include/ED_anim_api.h
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-04-24 08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-04-24 10:51:45 UTC (rev 36312)
@@ -580,8 +580,9 @@
/* there's a conflict here... twosided colors versus culling...? */
/* defined by history, only texture faces have culling option */
/* we need that as mesh option builtin, next to double sided lighting */
- if(col1 && col2)
+ if(col2) {
glEnable(GL_CULL_FACE);
+ }
cdDM_update_normals_from_pbvh(dm);
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2011-04-24 08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2011-04-24 10:51:45 UTC (rev 36312)
@@ -1541,8 +1541,10 @@
}
glShadeModel(GL_SMOOTH);
- if(col1 && col2)
+
+ if(col2) {
glEnable(GL_CULL_FACE);
+ }
glBegin(GL_QUADS);
for (; !ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) {
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2011-04-24
08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2011-04-24
10:51:45 UTC (rev 36312)
@@ -2068,6 +2068,7 @@
linep= linep+(text->undo_buf[text->undo_pos]<<8);
text->undo_pos++;
linep= linep+(text->undo_buf[text->undo_pos]<<16);
text->undo_pos++;
linep= linep+(text->undo_buf[text->undo_pos]<<24);
text->undo_pos++;
+ (void)linep;
break;
case UNDO_INDENT:
Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2011-04-24 08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c
2011-04-24 10:51:45 UTC (rev 36312)
@@ -3275,6 +3275,7 @@
draw_setting_widget(ac, ale, acf, block, offset, ymid,
ACHANNEL_SETTING_SOLO);
offset += ICON_WIDTH;
}
+ (void)offset;
}
/* step 4) draw text... */
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2011-04-24 08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2011-04-24 10:51:45 UTC (rev 36312)
@@ -169,9 +169,9 @@
case ANIMTYPE_DSLAT:
{
/* need to verify that this data is valid for
now */
- // XXX: ale may be null!
- if (ale->adt)
+ if (ale && ale->adt) {
ale->adt->flag |= ADT_UI_ACTIVE;
+ }
}
break;
}
@@ -1001,7 +1001,7 @@
for (agrp= act->groups.first; agrp; agrp= agrp->next) {
/* only consider F-Curves if they're visible (group
expanded) */
- if (EXPANDED_AGRP(agrp)) {
+ if (EXPANDED_AGRP(ac, agrp)) {
rearrange_animchannel_islands(&agrp->channels,
rearrange_func, mode, ANIMTYPE_FCURVE);
}
}
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c
2011-04-24 08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c
2011-04-24 10:51:45 UTC (rev 36312)
@@ -1017,7 +1017,7 @@
* but the group isn't expanded...
*/
if ( (filter_mode & (ANIMFILTER_SEL|ANIMFILTER_UNSEL)) &&
/* care about selection status */
- (EXPANDED_AGRP(agrp)==0) )
/* group isn't expanded */
+ (EXPANDED_AGRP(ac, agrp)==0) )
/* group isn't expanded */
{
/* if the group itself isn't selected appropriately, we
shouldn't consider it's children either */
if (ANIMCHANNEL_SELOK(SEL_AGRP(agrp)) == 0)
@@ -1076,7 +1076,7 @@
* - group is expanded
* - we just need the F-Curves present
*/
- if ( (!(filter_mode & ANIMFILTER_VISIBLE) ||
EXPANDED_AGRP(agrp)) || (filter_mode & ANIMFILTER_CURVESONLY) )
+ if ( (!(filter_mode & ANIMFILTER_VISIBLE) ||
EXPANDED_AGRP(ac, agrp)) || (filter_mode & ANIMFILTER_CURVESONLY) )
{
/* for the Graph Editor, curves may be
set to not be visible in the view to lessen clutter,
* but to do this, we need to check
that the group doesn't have it's not-visible flag set preventing
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-04-24
08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-04-24
10:51:45 UTC (rev 36312)
@@ -951,7 +951,7 @@
++i;
}
- fp+= 3;
curofp+= 3; /* alphas */
+ fp+= 3;
/* alphas */
} else {
for (j=
0; j < 3; ++j, ++i) {
VECCOPY(fp, bezt->vec[j]);
@@ -5662,7 +5662,7 @@
Curve *cu= obedit->data;
EditNurb *editnurb= cu->editnurb;
ListBase *nubase= &editnurb->nurbs;
- Nurb *nu, *next, *nu1;
+ Nurb *nu, *nu1;
BezTriple *bezt, *bezt1, *bezt2;
BPoint *bp, *bp1, *bp2;
int a, cut= 0, type= RNA_enum_get(op->ptr, "type");
@@ -5687,6 +5687,7 @@
if(type==0) {
/* first loop, can we remove entire pieces? */
+ Nurb *next;
nu= nubase->first;
while(nu) {
next= nu->next;
@@ -5815,7 +5816,6 @@
nu1= NULL;
nuindex= 0;
for(nu= nubase->first; nu; nu= nu->next) {
- next= nu->next;
if(nu->type == CU_BEZIER) {
bezt= nu->bezt;
for(a=0; a<nu->pntsu-1; a++) {
Modified: trunk/blender/source/blender/editors/include/ED_anim_api.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_anim_api.h 2011-04-24
08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/editors/include/ED_anim_api.h 2011-04-24
10:51:45 UTC (rev 36312)
@@ -251,7 +251,7 @@
/* Actions (also used for Dopesheet) */
/* Action Channel Group */
#define EDITABLE_AGRP(agrp) ((agrp->flag & AGRP_PROTECTED)==0)
-#define EXPANDED_AGRP(agrp) \
+#define EXPANDED_AGRP(ac, agrp) \
( ( ((ac)->spacetype == SPACE_IPO) && (agrp->flag & AGRP_EXPANDED_G) )
|| \
( ((ac)->spacetype != SPACE_IPO) && (agrp->flag & AGRP_EXPANDED) ) )
#define SEL_AGRP(agrp) ((agrp->flag & AGRP_SELECTED) || (agrp->flag &
AGRP_ACTIVE))
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2011-04-24
08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2011-04-24
10:51:45 UTC (rev 36312)
@@ -1643,6 +1643,8 @@
BLF_draw_ascii(blf_mono_font, str, sizeof(str));
dx += BLF_width(blf_mono_font, str);
}
+
+ (void)dx;
}
#if 0
Modified: trunk/blender/source/blender/imbuf/intern/scaling.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/scaling.c 2011-04-24 08:11:44 UTC
(rev 36311)
+++ trunk/blender/source/blender/imbuf/intern/scaling.c 2011-04-24 10:51:45 UTC
(rev 36312)
@@ -952,6 +952,7 @@
ibuf->mall |= IB_rectfloat;
ibuf->rect_float = _newrectf;
}
+ (void)rect_size; /* UNUSED in release builds */
ibuf->x = newx;
return(ibuf);
@@ -1082,6 +1083,7 @@
ibuf->mall |= IB_rectfloat;
ibuf->rect_float = (float *) _newrectf;
}
+ (void)rect_size; /* UNUSED in release builds */
ibuf->y = newy;
return(ibuf);
Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c
2011-04-24 08:11:44 UTC (rev 36311)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c
2011-04-24 10:51:45 UTC (rev 36312)
@@ -726,7 +726,7 @@
/* in latter case, only last multiplication uses 'nl' */
static float OrenNayar_Diff(float nl, float *n, float *l, float *v, float
rough )
{
- float i, nh, nv, vh, realnl, h[3];
+ float i/*, nh*/, nv, vh, realnl, h[3];
float a, b, t, A, B;
float Lit_A, View_A, Lit_B[3], View_B[3];
@@ -735,8 +735,8 @@
h[2]= v[2]+l[2];
normalize_v3(h);
- nh= n[0]*h[0]+n[1]*h[1]+n[2]*h[2]; /* Dot product between surface
normal and half-way vector */
- if(nh<0.0f) nh = 0.0f;
+ /* nh= n[0]*h[0]+n[1]*h[1]+n[2]*h[2]; */ /* Dot product between surface
normal and half-way vector */
+ /* if(nh<0.0f) nh = 0.0f; */
nv= n[0]*v[0]+n[1]*v[1]+n[2]*v[2]; /* Dot product between surface
normal and view vector */
if(nv<=0.0f) nv= 0.0f;
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2011-04-24 08:11:44 UTC
(rev 36311)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2011-04-24 10:51:45 UTC
(rev 36312)
@@ -1514,7 +1514,7 @@
void KX_Scene::LogicEndFrame()
{
m_logicmgr->EndFrame();
- int numobj = m_euthanasyobjects->GetCount();
+ int numobj;
KX_GameObject* obj;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
