forked from bartvdbraak/blender
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.
This commit is contained in:
parent
5c4743b9ee
commit
8fdebf24f4
@ -580,8 +580,9 @@ static void cdDM_drawFacesColored(DerivedMesh *dm, int useTwoSided, unsigned cha
|
||||
/* 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);
|
||||
|
||||
|
@ -1541,8 +1541,10 @@ static void ccgDM_drawFacesColored(DerivedMesh *dm, int UNUSED(useTwoSided), uns
|
||||
}
|
||||
|
||||
glShadeModel(GL_SMOOTH);
|
||||
if(col1 && col2)
|
||||
|
||||
if(col2) {
|
||||
glEnable(GL_CULL_FACE);
|
||||
}
|
||||
|
||||
glBegin(GL_QUADS);
|
||||
for (; !ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) {
|
||||
|
@ -2068,6 +2068,7 @@ void txt_do_redo(Text *text)
|
||||
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:
|
||||
|
@ -3275,6 +3275,7 @@ void ANIM_channel_draw_widgets (bAnimContext *ac, bAnimListElem *ale, uiBlock *b
|
||||
draw_setting_widget(ac, ale, acf, block, offset, ymid, ACHANNEL_SETTING_SOLO);
|
||||
offset += ICON_WIDTH;
|
||||
}
|
||||
(void)offset;
|
||||
}
|
||||
|
||||
/* step 4) draw text... */
|
||||
|
@ -169,9 +169,9 @@ void ANIM_set_active_channel (bAnimContext *ac, void *data, short datatype, int
|
||||
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 @@ static void rearrange_action_channels (bAnimContext *ac, bAction *act, short mod
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
@ -1017,7 +1017,7 @@ static int animdata_filter_action (bAnimContext *ac, ListBase *anim_data, bDopeS
|
||||
* 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 @@ static int animdata_filter_action (bAnimContext *ac, ListBase *anim_data, bDopeS
|
||||
* - 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
|
||||
|
@ -951,7 +951,7 @@ static void calc_shapeKeys(Object *obedit)
|
||||
++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 @@ static int delete_exec(bContext *C, wmOperator *op)
|
||||
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 @@ static int delete_exec(bContext *C, wmOperator *op)
|
||||
|
||||
if(type==0) {
|
||||
/* first loop, can we remove entire pieces? */
|
||||
Nurb *next;
|
||||
nu= nubase->first;
|
||||
while(nu) {
|
||||
next= nu->next;
|
||||
@ -5815,7 +5816,6 @@ static int delete_exec(bContext *C, wmOperator *op)
|
||||
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++) {
|
||||
|
@ -251,7 +251,7 @@ typedef enum eAnimFilter_Flags {
|
||||
/* 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))
|
||||
|
@ -1643,6 +1643,8 @@ void draw_nodespace_color_info(ARegion *ar, int color_manage, int channels, int
|
||||
BLF_draw_ascii(blf_mono_font, str, sizeof(str));
|
||||
dx += BLF_width(blf_mono_font, str);
|
||||
}
|
||||
|
||||
(void)dx;
|
||||
}
|
||||
|
||||
#if 0
|
||||
|
@ -952,6 +952,7 @@ static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx)
|
||||
ibuf->mall |= IB_rectfloat;
|
||||
ibuf->rect_float = _newrectf;
|
||||
}
|
||||
(void)rect_size; /* UNUSED in release builds */
|
||||
|
||||
ibuf->x = newx;
|
||||
return(ibuf);
|
||||
@ -1082,6 +1083,7 @@ static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy)
|
||||
ibuf->mall |= IB_rectfloat;
|
||||
ibuf->rect_float = (float *) _newrectf;
|
||||
}
|
||||
(void)rect_size; /* UNUSED in release builds */
|
||||
|
||||
ibuf->y = newy;
|
||||
return(ibuf);
|
||||
|
@ -726,7 +726,7 @@ static float Toon_Diff( float *n, float *l, float *v, float size, float smooth )
|
||||
/* 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 @@ static float OrenNayar_Diff(float nl, float *n, float *l, float *v, float rough
|
||||
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;
|
||||
|
@ -1514,7 +1514,7 @@ void KX_Scene::LogicUpdateFrame(double curtime, bool frame)
|
||||
void KX_Scene::LogicEndFrame()
|
||||
{
|
||||
m_logicmgr->EndFrame();
|
||||
int numobj = m_euthanasyobjects->GetCount();
|
||||
int numobj;
|
||||
|
||||
KX_GameObject* obj;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user