Revision: 51314
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51314
Author: campbellbarton
Date: 2012-10-14 13:08:19 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.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_regions.c
trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-10-14
11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-10-14
13:08:19 UTC (rev 51314)
@@ -193,8 +193,8 @@
BKE_lamp.h
BKE_lattice.h
BKE_library.h
+ BKE_main.h
BKE_mask.h
- BKE_main.h
BKE_material.h
BKE_mball.h
BKE_mesh.h
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2012-10-14
11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2012-10-14
13:08:19 UTC (rev 51314)
@@ -534,10 +534,12 @@
mul_m4_v3(imat, h2);
/* if next bone is B-bone too, use average handle direction */
- if (next->bone->segments > 1)
- ;
- else
+ if (next->bone->segments > 1) {
+ /* pass */
+ }
+ else {
h2[1] -= length;
+ }
normalize_v3(h2);
/* find the next roll to interpolate as well */
Modified: trunk/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/boids.c 2012-10-14
11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/blenkernel/intern/boids.c 2012-10-14
13:08:19 UTC (rev 51314)
@@ -101,13 +101,15 @@
break;
}
}
- else if (rule->type == eBoidRuleType_Goal && eob == bpa->ground)
- ; /* skip current object */
+ else if (rule->type == eBoidRuleType_Goal && eob ==
bpa->ground) {
+ /* skip current object */
+ }
else if (pd->forcefield == PFIELD_BOID && mul * pd->f_strength
> 0.0f && get_effector_data(cur, &cur_efd, &epoint, 0)) {
float temp = mul * pd->f_strength *
effector_falloff(cur, &cur_efd, &epoint, bbd->part->effector_weights);
- if (temp == 0.0f)
- ; /* do nothing */
+ if (temp == 0.0f) {
+ /* do nothing */
+ }
else if (temp > priority) {
priority = temp;
eff = cur;
Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c 2012-10-14
11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c 2012-10-14
13:08:19 UTC (rev 51314)
@@ -1013,10 +1013,12 @@
if (efd.falloff > 0.0f)
efd.falloff *=
eff_calc_visibility(colliders, eff, &efd, point);
- if (efd.falloff <= 0.0f)
- ; /* don't do anything */
- else if (eff->pd->forcefield == PFIELD_TEXTURE)
+ if (efd.falloff <= 0.0f) {
+ /* don't do anything */
+ }
+ else if (eff->pd->forcefield == PFIELD_TEXTURE)
{
do_texture_effector(eff, &efd, point,
force);
+ }
else {
float temp1[3]={0, 0, 0}, temp2[3];
copy_v3_v3(temp1, force);
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-10-14
11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-10-14
13:08:19 UTC (rev 51314)
@@ -3328,8 +3328,9 @@
cache->endframe = end;
cache->totpoint = 0;
- if (pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
- ; /*necessary info in every file*/
+ if (pid->type == PTCACHE_TYPE_SMOKE_DOMAIN) {
+ /* necessary info in every file */
+ }
/* read totpoint from info file (frame 0) */
else if (info) {
pf= ptcache_file_open(pid, PTCACHE_FILE_READ, 0);
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-10-14
11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-10-14
13:08:19 UTC (rev 51314)
@@ -4319,10 +4319,12 @@
if (smd->domain->ptcaches[1].first ||
smd->domain->point_cache[1]) {
if (smd->domain->point_cache[1]) {
PointCache *cache =
newdataadr(fd, smd->domain->point_cache[1]);
- if (cache->flag &
PTCACHE_FAKE_SMOKE)
- ; /* Smoke was already
saved in "new format" and this cache is a fake one. */
- else
+ if (cache->flag &
PTCACHE_FAKE_SMOKE) {
+ /* Smoke was already
saved in "new format" and this cache is a fake one. */
+ }
+ else {
printf("High resolution
smoke cache not available due to pointcache update. Please reset the
simulation.\n");
+ }
BKE_ptcache_free(cache);
}
smd->domain->ptcaches[1].first = NULL;
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2012-10-14
11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2012-10-14
13:08:19 UTC (rev 51314)
@@ -730,8 +730,9 @@
write_curvemapping(wd, node->storage);
else if (ntree->type==NTREE_TEXTURE &&
(node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME) )
write_curvemapping(wd, node->storage);
- else if (ntree->type==NTREE_COMPOSIT &&
node->type==CMP_NODE_MOVIEDISTORTION)
- /* pass */;
+ else if (ntree->type==NTREE_COMPOSIT &&
node->type==CMP_NODE_MOVIEDISTORTION) {
+ /* pass */
+ }
else
writestruct(wd, DATA,
node->typeinfo->storagename, 1, node->storage);
}
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2012-10-14
11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/editors/interface/interface.c 2012-10-14
13:08:19 UTC (rev 51314)
@@ -1528,7 +1528,9 @@
* so leave this unset */
value = UI_BUT_VALUE_UNSET;
}
- else if (but->pointype == 0) ;
+ else if (but->pointype == 0) {
+ /* pass */
+ }
else if (but->type == HSVSLI) {
float *fp, hsv[3];
@@ -1721,8 +1723,9 @@
BLI_strncpy(str, but->poin, maxlen);
return;
}
- else if (ui_but_anim_expression_get(but, str, maxlen))
- ; /* driver expression */
+ else if (ui_but_anim_expression_get(but, str, maxlen)) {
+ /* driver expression */
+ }
else {
/* number editing */
double value;
@@ -2480,7 +2483,9 @@
if (rows > 0) {
uiBut *bt = but;
while (bt && bt->alignnr == nr) {
- if (bt->next &&
bt->next->alignnr == nr && buts_are_horiz(bt, bt->next) == 0) break;
+ if (bt->next &&
bt->next->alignnr == nr && buts_are_horiz(bt, bt->next) == 0) {
+ break;
+ }
bt = bt->next;
}
if (bt == NULL || bt->alignnr != nr)
flag = UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_RIGHT;
@@ -2714,9 +2719,8 @@
}
/* keep track of UI_interface.h */
- if (ELEM7(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX,
BUTM)) ;
- else if (ELEM(but->type, SCROLL, SEPR /* , FTPREVIEW */ )) ;
- else if (but->type >= SEARCH_MENU) ;
+ if (ELEM9(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX,
LISTBOX, BUTM, SCROLL, SEPR /* , FTPREVIEW */)) {}
+ else if (but->type >= SEARCH_MENU) {}
else but->flag |= UI_BUT_UNDO;
BLI_addtail(&block->buttons, but);
@@ -2750,7 +2754,7 @@
static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char
*str,
- int x, int y, short
width, short height,
+ int x, int y, short width, short height,
PointerRNA *ptr, PropertyRNA *prop, int index,
float min, float max, float a1, float a2, const
char *tip)
{
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2012-10-14 11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2012-10-14 13:08:19 UTC (rev 51314)
@@ -6621,7 +6621,9 @@
}
}
- if (menu->menuretval) ;
+ if (menu->menuretval) {
+ /* pass */
+ }
else if (event->type == ESCKEY && event->val ==
KM_PRESS) {
/* esc cancels this and all preceding menus */
menu->menuretval = UI_RETURN_CANCEL;
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c
2012-10-14 11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c
2012-10-14 13:08:19 UTC (rev 51314)
@@ -2674,14 +2674,18 @@
ds = BLI_dynstr_new();
for (report = reports->list.first; report; report = report->next) {
- if (report->type < reports->printlevel)
- ; /* pass */
- else if (report->type >= RPT_ERROR)
+ if (report->type < reports->printlevel) {
+ /* pass */
+ }
+ else if (report->type >= RPT_ERROR) {
BLI_dynstr_appendf(ds, "Error %%i%d%%t|%s", ICON_ERROR,
report->message);
- else if (report->type >= RPT_WARNING)
+ }
+ else if (report->type >= RPT_WARNING) {
BLI_dynstr_appendf(ds, "Warning %%i%d%%t|%s",
ICON_ERROR, report->message);
- else if (report->type >= RPT_INFO)
+ }
+ else if (report->type >= RPT_INFO) {
BLI_dynstr_appendf(ds, "Info %%i%d%%t|%s", ICON_INFO,
report->message);
+ }
}
str = BLI_dynstr_get_cstring(ds);
Modified: trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
2012-10-14 11:43:19 UTC (rev 51313)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_ops.c
2012-10-14 13:08:19 UTC (rev 51314)
@@ -207,7 +207,7 @@
* user-prefs exception - campbell */
if (RNA_struct_find_property(op->ptr, "relative_path")) {
if (!RNA_struct_property_is_set(op->ptr,
"relative_path")) {
- /* annoying exception!, if were dealign with
the user prefs, default relative to be off */
+ /* annoying exception!, if were dealing with
the user prefs, default relative to be off */
RNA_boolean_set(op->ptr, "relative_path",
U.flag & USER_RELPATHS && (ptr.data != &U));
}
}
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
