griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2012-10-31 10:09:06 +00:00
parent 12ed0c64bc
commit 00b8c2afa1
6 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/cdderivedmesh.c
View File

@@ -741,13 +741,16 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
else {
if (index_mf_to_mpoly) {
orig = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, actualFace);
if (orig == ORIGINDEX_NONE) continue;
if (drawParamsMapped)
if (orig == ORIGINDEX_NONE) {
continue;
}
if (drawParamsMapped) {
draw_option = drawParamsMapped(userData, orig);
}
}
else
if (drawParamsMapped)
else if (drawParamsMapped) {
draw_option = drawParamsMapped(userData, actualFace);
}
}
/* flush buffer if current triangle isn't drawable or it's last triangle */

5
source/blender/blenkernel/intern/curve.c
View File

@@ -818,10 +818,7 @@ static void basisNurb(float t, short order, short pnts, float *knots, float *bas
opp2 = orderpluspnts - 1;
/* this is for float inaccuracy */
if (t < knots[0])
t = knots[0];
else
if (t > knots[opp2]) t = knots[opp2];
t = (t < knots[0]) ? knots[0] : knots[opp2];
/* this part is order '1' */
o2 = order + 1;

3
source/blender/blenkernel/intern/texture.c
View File

@@ -909,8 +909,7 @@ void autotexname(Tex *tex)
if (tex->use_nodes) {
new_id(&bmain->tex, (ID *)tex, "Noddy");
}
else
if (tex->type == TEX_IMAGE) {
else if (tex->type == TEX_IMAGE) {
ima = tex->ima;
if (ima) {
BLI_strncpy(di, ima->name, sizeof(di));

3
source/blender/editors/physics/physics_fluid.c
View File

@@ -944,8 +944,7 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor
if (domainSettings->resolutionxyz>128) {
gridlevels = 2;
}
else
if (domainSettings->resolutionxyz>64) {
else if (domainSettings->resolutionxyz > 64) {
gridlevels = 1;
}
else {

7
source/blender/editors/screen/screen_ops.c
View File

@@ -3156,11 +3156,12 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), wmEvent *e
for (sa = window->screen->areabase.first; sa; sa = sa->next) {
ARegion *ar;
for (ar = sa->regionbase.first; ar; ar = ar->next) {
if (ar == sad->ar)
if (ar == sad->ar) {
ED_region_tag_redraw(ar);
else
if (match_region_with_redraws(sa->spacetype, ar->regiontype, sad->redraws))
}
else if (match_region_with_redraws(sa->spacetype, ar->regiontype, sad->redraws)) {
ED_region_tag_redraw(ar);
}
}
if (match_area_with_refresh(sa->spacetype, sad->refresh))

3
source/blender/editors/space_sequencer/sequencer_select.c
View File

@@ -414,8 +414,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
BLI_strncpy(ed->act_imagedir, seq->strip->dir, FILE_MAXDIR);
}
}
else
if (seq->type == SEQ_TYPE_SOUND_RAM) {
else if (seq->type == SEQ_TYPE_SOUND_RAM) {
if (seq->strip) {
BLI_strncpy(ed->act_sounddir, seq->strip->dir, FILE_MAXDIR);
}