archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2017-11-01 11:56:56 +11:00
parent 4e33d07565
commit 2ae6a93f05
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/alembic/intern/abc_mball.cc
View File

@@ -54,7 +54,7 @@ AbcMBallWriter::AbcMBallWriter(
m_is_animated = isAnimated(); m_is_animated = isAnimated();
m_mesh_ob = BKE_object_copy(bmain, ob); m_mesh_ob = BKE_object_copy(bmain, ob);
m_mesh_ob->curve_cache = (CurveCache*)MEM_callocN( m_mesh_ob->curve_cache = (CurveCache *)MEM_callocN(
sizeof(CurveCache), sizeof(CurveCache),
"CurveCache for AbcMBallWriter"); "CurveCache for AbcMBallWriter");

6
source/blender/blenkernel/intern/fcurve.c
View File

@@ -896,7 +896,7 @@ bool BKE_fcurve_is_cyclic(FCurve *fcu)
if (fcm->flag & (FMODIFIER_FLAG_RANGERESTRICT | FMODIFIER_FLAG_USEINFLUENCE)) if (fcm->flag & (FMODIFIER_FLAG_RANGERESTRICT | FMODIFIER_FLAG_USEINFLUENCE))
return false; return false;
FMod_Cycles *data = (FMod_Cycles*)fcm->data; FMod_Cycles *data = (FMod_Cycles *)fcm->data;
return data && data->after_cycles == 0 && data->before_cycles == 0 && return data && data->after_cycles == 0 && data->before_cycles == 0 &&
ELEM(data->before_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET) && ELEM(data->before_mode, FCM_EXTRAPOLATE_CYCLIC, FCM_EXTRAPOLATE_CYCLIC_OFFSET) &&
@@ -939,14 +939,14 @@ void calchandles_fcurve(FCurve *fcu)
return; return;
/* if the first modifier is Cycles, smooth the curve through the cycle */ /* if the first modifier is Cycles, smooth the curve through the cycle */
BezTriple *first = &fcu->bezt[0], *last = &fcu->bezt[fcu->totvert-1]; BezTriple *first = &fcu->bezt[0], *last = &fcu->bezt[fcu->totvert - 1];
BezTriple tmp; BezTriple tmp;
bool cycle = BKE_fcurve_is_cyclic(fcu) && BEZT_IS_AUTOH(first) && BEZT_IS_AUTOH(last); bool cycle = BKE_fcurve_is_cyclic(fcu) && BEZT_IS_AUTOH(first) && BEZT_IS_AUTOH(last);
/* get initial pointers */ /* get initial pointers */
bezt = fcu->bezt; bezt = fcu->bezt;
prev = cycle_offset_triple(cycle, &tmp, &fcu->bezt[fcu->totvert-2], last, first); prev = cycle_offset_triple(cycle, &tmp, &fcu->bezt[fcu->totvert - 2], last, first);
next = (bezt + 1); next = (bezt + 1);
/* loop over all beztriples, adjusting handles */ /* loop over all beztriples, adjusting handles */

4
source/blender/bmesh/intern/bmesh_edgeloop.c
View File

@@ -168,8 +168,8 @@ int BM_mesh_edgeloops_find(
/* add both directions */ /* add both directions */
if (bm_loop_build(el_store, e->v1, e->v2, 1) && if (bm_loop_build(el_store, e->v1, e->v2, 1) &&
bm_loop_build(el_store, e->v2, e->v1, -1) && bm_loop_build(el_store, e->v2, e->v1, -1) &&
el_store->len > 1) el_store->len > 1)
{ {
BLI_addtail(r_eloops, el_store); BLI_addtail(r_eloops, el_store);
count++; count++;

2
source/blender/editors/interface/interface_layout.c
View File

@@ -875,7 +875,7 @@ void uiItemFullO(
ot, opname, { ot, opname, {
if (r_opptr) { if (r_opptr) {
*r_opptr = PointerRNA_NULL; *r_opptr = PointerRNA_NULL;
}; }
return; return;
}); });