Revision: 46818
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46818
Author: campbellbarton
Date: 2012-05-20 19:49:27 +0000 (Sun, 20 May 2012)
Log Message:
-----------
code cleanup:
- style - multi-line ifs move braces onto new lines.
- iterators - convert some to macros, other split up and move brace.
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/image_gen.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/ocean.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/blenlib/intern/string.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/versioning_250.c
trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/operators/bmo_connect.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/mesh/editmesh_rip.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
trunk/blender/source/blender/imbuf/intern/filter.c
trunk/blender/source/blender/imbuf/intern/indexer_dv.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/makesdna/intern/dna_genfile.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
trunk/blender/source/blender/python/generic/idprop_py_api.c
trunk/blender/source/blender/python/intern/bpy_library.c
trunk/blender/source/blender/python/intern/bpy_operator.c
trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.cpp
trunk/blender/source/gameengine/GameLogic/SCA_IController.h
trunk/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
trunk/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
trunk/blender/source/gameengine/SceneGraph/SG_Spatial.cpp
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2012-05-20 19:35:49 UTC
(rev 46817)
+++ trunk/blender/source/blender/avi/intern/avi.c 2012-05-20 19:49:27 UTC
(rev 46818)
@@ -215,7 +215,8 @@
if (GET_FCC(fp) != FCC("RIFF") ||
!GET_FCC(fp) ||
- GET_FCC(fp) != FCC("AVI ")) {
+ GET_FCC(fp) != FCC("AVI "))
+ {
ret = 0;
}
else {
@@ -245,7 +246,8 @@
return 0;
if (GET_FCC(movie.fp) != FCC("RIFF") ||
- !(movie.size = GET_FCC(movie.fp))) {
+ !(movie.size = GET_FCC(movie.fp)))
+ {
fclose(movie.fp);
return 0;
}
@@ -257,7 +259,8 @@
!GET_FCC(movie.fp) ||
GET_FCC(movie.fp) != FCC("hdrl") ||
(movie.header->fcc = GET_FCC(movie.fp)) != FCC("avih") ||
- !(movie.header->size = GET_FCC(movie.fp))) {
+ !(movie.header->size = GET_FCC(movie.fp)))
+ {
DEBUG_PRINT("bad initial header info\n");
fclose(movie.fp);
return 0;
@@ -378,8 +381,7 @@
fcca = bi->Compression;
- if (movie.streams[temp].format ==
- AVI_FORMAT_AVI_RGB) {
+ if (movie.streams[temp].format ==
AVI_FORMAT_AVI_RGB) {
if (fcca == FCC("DIB ") ||
fcca == FCC("RGB ") ||
fcca == FCC("rgb ") ||
Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-05-20
19:35:49 UTC (rev 46817)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-05-20
19:49:27 UTC (rev 46818)
@@ -1166,7 +1166,8 @@
v->flags = Vert_eEffected | seamflag;
}
else if (!VertDataEqual(vertData, _vert_getCo(v, 0,
ss->meshIFC.vertDataSize), ss) ||
- ((v->flags & Vert_eSeam) != seamflag)) {
+ ((v->flags & Vert_eSeam) != seamflag))
+ {
*prevp = v->next;
_ehash_insert(ss->vMap, (EHEntry *) v);
VertDataCopy(_vert_getCo(v, 0,
ss->meshIFC.vertDataSize), vertData, ss);
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-05-20 19:35:49 UTC (rev 46817)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-05-20 19:49:27 UTC (rev 46818)
@@ -1546,7 +1546,7 @@
/* if this is not the last modifier in the stack then
recalculate the normals
* to avoid giving bogus normals to the next modifier
see: [#23673] */
- if (isPrevDeform && mti->dependsOnNormals &&
mti->dependsOnNormals(md)) {
+ if (isPrevDeform && mti->dependsOnNormals &&
mti->dependsOnNormals(md)) {
/* XXX, this covers bug #23673, but we may need
normal calc for other types */
if (dm && dm->type == DM_TYPE_CDDM) {
CDDM_apply_vert_coords(dm,
deformedVerts);
@@ -2942,7 +2942,7 @@
#endif
glDisable(GL_LIGHTING);
- /* if (GPU_buffer_legacy(dm) ) */ { /* TODO - VBO draw code, not high
priority - campbell */
+ /* if (GPU_buffer_legacy(dm) ) */ { /* TODO - VBO draw code, not high
priority - campbell */
DEBUG_VBO("Using legacy code. drawNavMeshColored\n");
//glShadeModel(GL_SMOOTH);
glBegin(glmode = GL_QUADS);
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-05-20
19:35:49 UTC (rev 46817)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-05-20
19:49:27 UTC (rev 46818)
@@ -334,7 +334,8 @@
{
if (main->minversionfile > BLENDER_VERSION ||
(main->minversionfile == BLENDER_VERSION &&
- main->minsubversionfile > BLENDER_SUBVERSION)) {
+ main->minsubversionfile > BLENDER_SUBVERSION))
+ {
BKE_reportf(reports, RPT_ERROR, "File written by newer Blender
binary: %d.%d , expect loss of data!", main->minversionfile,
main->minsubversionfile);
}
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-05-20 19:35:49 UTC (rev 46817)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-05-20 19:49:27 UTC (rev 46818)
@@ -640,9 +640,8 @@
if (drawParamsMapped) {
draw_option = drawParamsMapped(userData, orig); }
else { if (nors)
nors += 3; continue; }
}
- else
- if (drawParamsMapped) draw_option =
drawParamsMapped(userData, i);
- else { if (nors) nors += 3; continue; }
+ else if (drawParamsMapped) { draw_option =
drawParamsMapped(userData, i); }
+ else { if (nors) nors +=
3; continue; }
}
if (draw_option != DM_DRAW_OPTION_SKIP) {
@@ -2397,11 +2396,13 @@
CustomData_add_layer(&edgeData, CD_MEDGE, CD_CALLOC, NULL, numEdges);
CustomData_add_layer(&edgeData, CD_ORIGINDEX, CD_CALLOC, NULL,
numEdges);
- ehi = BLI_edgehashIterator_new(eh);
med = CustomData_get_layer(&edgeData, CD_MEDGE);
index = CustomData_get_layer(&edgeData, CD_ORIGINDEX);
- for (i = 0; !BLI_edgehashIterator_isDone(ehi);
- BLI_edgehashIterator_step(ehi), ++i, ++med, ++index) {
+
+ for (ehi = BLI_edgehashIterator_new(eh), i = 0;
+ BLI_edgehashIterator_isDone(ehi) == FALSE;
+ BLI_edgehashIterator_step(ehi), ++i, ++med, ++index)
+ {
BLI_edgehashIterator_getKey(ehi, &med->v1, &med->v2);
med->flag = ME_EDGEDRAW | ME_EDGERENDER;
@@ -2460,11 +2461,13 @@
CustomData_add_layer(&edgeData, CD_MEDGE, CD_CALLOC, NULL, numEdges);
CustomData_add_layer(&edgeData, CD_ORIGINDEX, CD_CALLOC, NULL,
numEdges);
- ehi = BLI_edgehashIterator_new(eh);
med = CustomData_get_layer(&edgeData, CD_MEDGE);
index = CustomData_get_layer(&edgeData, CD_ORIGINDEX);
- for (i = 0; !BLI_edgehashIterator_isDone(ehi);
- BLI_edgehashIterator_step(ehi), ++i, ++med, ++index) {
+
+ for (ehi = BLI_edgehashIterator_new(eh), i = 0;
+ BLI_edgehashIterator_isDone(ehi) == FALSE;
+ BLI_edgehashIterator_step(ehi), ++i, ++med, ++index)
+ {
BLI_edgehashIterator_getKey(ehi, &med->v1, &med->v2);
j = GET_INT_FROM_POINTER(BLI_edgehashIterator_getValue(ehi));
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-20
19:35:49 UTC (rev 46817)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-20
19:49:27 UTC (rev 46818)
@@ -2323,7 +2323,8 @@
/* if we found a matching layer, copy the data */
if (dest->layers[dest_i].type == source->layers[src_i].type &&
- strcmp(dest->layers[dest_i].name,
source->layers[src_i].name) == 0) {
+ strcmp(dest->layers[dest_i].name,
source->layers[src_i].name) == 0)
+ {
char *src_data = (char *)src_block +
source->layers[src_i].offset;
char *dest_data = (char *)*dest_block +
dest->layers[dest_i].offset;
Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-20
19:35:49 UTC (rev 46817)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-05-20
19:49:27 UTC (rev 46818)
@@ -901,7 +901,8 @@
continue;
if (mti->type == eModifierTypeType_OnlyDeform ||
- (mti->type == eModifierTypeType_DeformOrConstruct && !dm)) {
+ (mti->type == eModifierTypeType_DeformOrConstruct && !dm))
+ {
if (editmode)
appf |= MOD_APPLY_USECACHE;
if (dm) {
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-05-20 19:35:49 UTC (rev 46817)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-05-20 19:49:27 UTC (rev 46818)
@@ -2035,7 +2035,8 @@
int v4 = (mface[i].v4) ? mface[i].v4 : -1;
if ((e1_index == mface[i].v1 || e1_index ==
mface[i].v2 || e1_index == mface[i].v3 || e1_index == v4) &&
- (e2_index == mface[i].v1 || e2_index ==
mface[i].v2 || e2_index == mface[i].v3 || e2_index == v4)) {
+ (e2_index == mface[i].v1 || e2_index ==
mface[i].v2 || e2_index == mface[i].v3 || e2_index == v4))
+ {
if (i == cPoint->face_index) continue;
target_face = i;
@@ -3511,7 +3512,8 @@
}
/* get final object
space depth */
else if (surface->type
== MOD_DPAINT_SURFACE_T_DISPLACE ||
- surface->type
== MOD_DPAINT_SURFACE_T_WAVE) {
+ surface->type
== MOD_DPAINT_SURFACE_T_WAVE)
+ {
depth /=
bData->bNormal[index].normal_scale * total_sample;
}
@@ -3803,8 +3805,8 @@
/* Smooth range or color ramp */
if (brush->proximity_falloff == MOD_DPAINT_PRFALL_SMOOTH ||
- brush->proximity_falloff == MOD_DPAINT_PRFALL_RAMP) {
-
+ brush->proximity_falloff == MOD_DPAINT_PRFALL_RAMP)
+ {
strength = 1.0f - distance / brush_radius;
CLAMP(strength, 0.0f, 1.0f);
}
@@ -3855,7 +3857,8 @@
if (surface->type == MOD_DPAINT_SURFACE_T_PAINT) {
if (brush->proximity_falloff ==
MOD_DPAINT_PRFALL_RAMP &&
- !(brush->flags & MOD_DPAINT_RAMP_ALPHA)) {
+ !(brush->flags & MOD_DPAINT_RAMP_ALPHA))
+ {
paintColor[0] = colorband[0];
paintColor[1] = colorband[1];
paintColor[2] = colorband[2];
@@ -4400,7 +4403,8 @@
avg_dist = (numOfN) ? avg_dist / numOfN : 0.0f;
if (surface->flags & MOD_DPAINT_WAVE_OPEN_BORDERS &&
- sData->adj_data->flags[index] & ADJ_ON_MESH_EDGE) {
+ sData->adj_data->flags[index] & ADJ_ON_MESH_EDGE)
+ {
/* if open borders, apply a fake height to keep
waves going on */
avg_height = (numOfRN) ? avg_height / numOfRN :
0.0f;
wPoint->height = (dt * wave_speed * avg_height
+ wPoint->height * avg_dist) / (avg_dist + dt * wave_speed);
@@ -4507,7 +4511,8 @@
/* dissolve for float types */
else if (surface->flags & MOD_DPAINT_DISSOLVE &&
(surface->type == MOD_DPAINT_SURFACE_T_DISPLACE ||
- surface->type == MOD_DPAINT_SURFACE_T_WEIGHT)) {
+ surface->type == MOD_DPAINT_SURFACE_T_WEIGHT))
+ {
float *point = &((float *)sData->type_data)[index];
/* log or linear */
@@ -4727,7 +4732,8 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
