[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46010] trunk/blender: style cleanup: changes to brace placement / newlines - for/while/if/switch
Campbell Barton
ideasman42 at gmail.com
Sat Apr 28 08:31:57 CEST 2012
Revision: 46010
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46010
Author: campbellbarton
Date: 2012-04-28 06:31:57 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
style cleanup: changes to brace placement / newlines - for/while/if/switch
Modified Paths:
--------------
trunk/blender/intern/container/CTR_Map.h
trunk/blender/intern/ghost/GHOST_Rect.h
trunk/blender/intern/guardedalloc/intern/mallocn.c
trunk/blender/intern/mikktspace/mikktspace.c
trunk/blender/intern/utfconv/utf_winfunc.c
trunk/blender/release/plugins/sequence/blur.c
trunk/blender/release/plugins/texture/clouds2.c
trunk/blender/release/plugins/texture/tiles.c
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/avi/intern/codecs.c
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/bvhutils.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/context.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/fmodifier.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/idprop.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/image_gen.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/navmesh_conversion.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/ocean.c
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenkernel/intern/paint.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/property.c
trunk/blender/source/blender/blenkernel/intern/report.c
trunk/blender/source/blender/blenkernel/intern/sca.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenkernel/intern/sketch.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/sound.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/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/DLRB_tree.c
trunk/blender/source/blender/blenlib/intern/bpath.c
trunk/blender/source/blender/blenlib/intern/dynlib.c
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenlib/intern/graph.c
trunk/blender/source/blender/blenlib/intern/listbase.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/blenlib/intern/string_utf8.c
trunk/blender/source/blender/blenloader/intern/readblenentry.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/CameraExporter.cpp
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/EffectExporter.cpp
trunk/blender/source/blender/collada/ErrorHandler.cpp
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/collada/GeometryExporter.h
trunk/blender/source/blender/collada/ImageExporter.cpp
trunk/blender/source/blender/collada/LightExporter.cpp
trunk/blender/source/blender/collada/MaterialExporter.cpp
trunk/blender/source/blender/collada/MaterialExporter.h
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/collada/SceneExporter.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
trunk/blender/source/blender/collada/TransformWriter.cpp
trunk/blender/source/blender/collada/collada_internal.cpp
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_generate.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.c
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_shapekey.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/glutil.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
trunk/blender/source/blender/editors/sound/sound_ops.c
trunk/blender/source/blender/editors/space_action/space_action.c
trunk/blender/source/blender/editors/space_buttons/buttons_context.c
trunk/blender/source/blender/editors/space_buttons/buttons_header.c
trunk/blender/source/blender/editors/space_buttons/space_buttons.c
trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
trunk/blender/source/blender/editors/space_clip/space_clip.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_file/fsmenu.c
trunk/blender/source/blender/editors/space_file/space_file.c
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
trunk/blender/source/blender/editors/space_graph/space_graph.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_logic/logic_buttons.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_logic/space_logic.c
trunk/blender/source/blender/editors/space_nla/nla_buttons.c
trunk/blender/source/blender/editors/space_nla/space_nla.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_templates.c
trunk/blender/source/blender/editors/space_node/space_node.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_select.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/editors/space_outliner/space_outliner.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_time/space_time.c
trunk/blender/source/blender/editors/space_userpref/space_userpref.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_input.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/editors/util/numinput.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
trunk/blender/source/blender/imbuf/intern/dds/PixelFormat.h
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
trunk/blender/source/blender/imbuf/intern/targa.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/makesdna/intern/dna_genfile.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/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_main.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/modifiers/intern/MOD_remesh.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
trunk/blender/source/blender/modifiers/intern/MOD_util.c
trunk/blender/source/blender/modifiers/intern/MOD_warp.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvg_util.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_levels.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_transform.c
trunk/blender/source/blender/nodes/shader/node_shader_util.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
trunk/blender/source/blender/quicktime/apple/quicktime_import.c
trunk/blender/source/blender/render/intern/raytrace/bvh.h
trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_hint.h
trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/reorganize.h
trunk/blender/source/blender/render/intern/raytrace/svbvh.h
trunk/blender/source/blender/render/intern/raytrace/vbvh.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/initrender.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/render/intern/source/renderdatabase.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/blender/render/intern/source/sunsky.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
trunk/blender/source/blender/render/intern/source/volumetric.c
trunk/blender/source/blender/render/intern/source/voxeldata.c
trunk/blender/source/blender/render/intern/source/zbuf.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/intern/container/CTR_Map.h
===================================================================
--- trunk/blender/intern/container/CTR_Map.h 2012-04-28 06:28:07 UTC (rev 46009)
+++ trunk/blender/intern/container/CTR_Map.h 2012-04-28 06:31:57 UTC (rev 46010)
@@ -63,7 +63,7 @@
for (int i = 0; i < m_num_buckets; ++i) {
m_buckets[i] = 0;
- for(Entry *entry = map.m_buckets[i]; entry; entry=entry->m_next)
+ for (Entry *entry = map.m_buckets[i]; entry; entry=entry->m_next)
insert(entry->m_key, entry->m_value);
}
}
Modified: trunk/blender/intern/ghost/GHOST_Rect.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_Rect.h 2012-04-28 06:28:07 UTC (rev 46009)
+++ trunk/blender/intern/ghost/GHOST_Rect.h 2012-04-28 06:31:57 UTC (rev 46010)
@@ -241,8 +241,10 @@
GHOST_TInt32 h= getHeight();
/* highly unlikely but avoid eternal loop */
- if(w-ofs*2 <= 0 || h-ofs*2 <= 0)
+ if (w-ofs*2 <= 0 || h-ofs*2 <= 0) {
return;
+ }
+
while(x-ofs < m_l) x+= w-(ofs*2);
while(y-ofs < m_t) y+= h-(ofs*2);
while(x+ofs > m_r) x-= w-(ofs*2);
Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c 2012-04-28 06:28:07 UTC (rev 46009)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c 2012-04-28 06:31:57 UTC (rev 46010)
@@ -243,7 +243,7 @@
MemHead *memh= vmemh;
memh--;
- if(memh->mmap)
+ if (memh->mmap)
newp= MEM_mapallocN(memh->len, "dupli_mapalloc");
else
newp= MEM_mallocN(memh->len, "dupli_alloc");
@@ -265,8 +265,8 @@
memh--;
newp= MEM_mallocN(len, memh->name);
- if(newp) {
- if(len < memh->len)
+ if (newp) {
+ if (len < memh->len)
memcpy(newp, vmemh, len);
else
memcpy(newp, vmemh, memh->len);
@@ -311,14 +311,14 @@
memh= (MemHead *)malloc(len+sizeof(MemHead)+sizeof(MemTail));
- if(memh) {
+ if (memh) {
make_memhead_header(memh, len, str);
mem_unlock_thread();
- if(malloc_debug_memset && len)
+ if (malloc_debug_memset && len)
memset(memh+1, 255, len);
#ifdef DEBUG_MEMCOUNTER
- if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
+ if (_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
memcount_raise(__func__);
memh->_count= _mallocn_count++;
#endif
@@ -339,11 +339,11 @@
memh= (MemHead *)calloc(len+sizeof(MemHead)+sizeof(MemTail),1);
- if(memh) {
+ if (memh) {
make_memhead_header(memh, len, str);
mem_unlock_thread();
#ifdef DEBUG_MEMCOUNTER
- if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
+ if (_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
memcount_raise(__func__);
memh->_count= _mallocn_count++;
#endif
@@ -366,14 +366,14 @@
memh= mmap(NULL, len+sizeof(MemHead)+sizeof(MemTail),
PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
- if(memh!=(MemHead *)-1) {
+ if (memh!=(MemHead *)-1) {
make_memhead_header(memh, len, str);
memh->mmap= 1;
mmap_in_use += len;
peak_mem = mmap_in_use > peak_mem ? mmap_in_use : peak_mem;
mem_unlock_thread();
#ifdef DEBUG_MEMCOUNTER
- if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
+ if (_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
memcount_raise(__func__);
memh->_count= _mallocn_count++;
#endif
@@ -406,9 +406,9 @@
const MemPrintBlock *pb1= (const MemPrintBlock*)p1;
const MemPrintBlock *pb2= (const MemPrintBlock*)p2;
- if(pb1->len < pb2->len)
+ if (pb1->len < pb2->len)
return 1;
- else if(pb1->len == pb2->len)
+ else if (pb1->len == pb2->len)
return 0;
else
return -1;
@@ -431,7 +431,7 @@
membl = membase->first;
if (membl) membl = MEMNEXT(membl);
- while(membl) {
+ while (membl) {
pb->name= membl->name;
pb->len= membl->len;
pb->items= 1;
@@ -439,18 +439,18 @@
totpb++;
pb++;
- if(membl->next)
+ if (membl->next)
membl= MEMNEXT(membl->next);
else break;
}
/* sort by name and add together blocks with the same name */
qsort(printblock, totpb, sizeof(MemPrintBlock), compare_name);
- for(a=0, b=0; a<totpb; a++) {
- if(a == b) {
+ for (a = 0, b=0; a<totpb; a++) {
+ if (a == b) {
continue;
}
- else if(strcmp(printblock[a].name, printblock[b].name) == 0) {
+ else if (strcmp(printblock[a].name, printblock[b].name) == 0) {
printblock[b].len += printblock[a].len;
printblock[b].items++;
}
@@ -465,7 +465,7 @@
qsort(printblock, totpb, sizeof(MemPrintBlock), compare_len);
printf("\ntotal memory len: %.3f MB\n", (double)mem_in_use/(double)(1024*1024));
printf(" ITEMS TOTAL-MiB AVERAGE-KiB TYPE\n");
- for(a=0, pb=printblock; a<totpb; a++, pb++)
+ for (a = 0, pb=printblock; a<totpb; a++, pb++)
printf("%6d (%8.3f %8.3f) %s\n", pb->items, (double)pb->len/(double)(1024*1024), (double)pb->len/1024.0/(double)pb->items, pb->name);
free(printblock);
@@ -491,7 +491,7 @@
print_error("# membase_debug.py\n");
print_error("membase = [\\\n");
}
- while(membl) {
+ while (membl) {
if (pydict) {
fprintf(stderr, "{'len':" SIZET_FORMAT ", 'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name, (void *)(membl+1));
} else {
@@ -501,7 +501,7 @@
print_error("%s len: " SIZET_FORMAT " %p\n", membl->name, SIZET_ARG(membl->len), membl+1);
#endif
}
- if(membl->next)
+ if (membl->next)
membl= MEMNEXT(membl->next);
else break;
}
@@ -536,9 +536,9 @@
membl = membase->first;
if (membl) membl = MEMNEXT(membl);
- while(membl) {
+ while (membl) {
func(membl+1);
- if(membl->next)
+ if (membl->next)
membl= MEMNEXT(membl->next);
else break;
}
@@ -554,13 +554,13 @@
membl = membase->first;
if (membl) membl = MEMNEXT(membl);
- while(membl) {
+ while (membl) {
if (vmemh == membl+1) {
mem_unlock_thread();
return 1;
}
- if(membl->next)
+ if (membl->next)
membl= MEMNEXT(membl->next);
else break;
}
@@ -585,13 +585,13 @@
MemHead *memh= vmemh;
const char *name;
- if (memh == NULL){
+ if (memh == NULL) {
MemorY_ErroR("free","attempt to free NULL pointer");
/* print_error(err_stream, "%d\n", (memh+4000)->tag1); */
return(-1);
}
- if(sizeof(intptr_t)==8) {
+ if (sizeof(intptr_t)==8) {
if (((intptr_t) memh) & 0x7) {
MemorY_ErroR("free","attempt to free illegal pointer");
return(-1);
@@ -605,7 +605,7 @@
}
memh--;
- if(memh->tag1 == MEMFREE && memh->tag2 == MEMFREE) {
+ if (memh->tag1 == MEMFREE && memh->tag2 == MEMFREE) {
MemorY_ErroR(memh->name,"double free");
return(-1);
}
@@ -613,7 +613,7 @@
mem_lock_thread();
if ((memh->tag1 == MEMTAG1) && (memh->tag2 == MEMTAG2) && ((memh->len & 0x3) == 0)) {
memt = (MemTail *)(((char *) memh) + sizeof(MemHead) + memh->len);
- if (memt->tag3 == MEMTAG3){
+ if (memt->tag3 == MEMTAG3) {
memh->tag1 = MEMFREE;
memh->tag2 = MEMFREE;
@@ -628,7 +628,7 @@
error = 2;
MemorY_ErroR(memh->name,"end corrupt");
name = check_memlist(memh);
- if (name != NULL){
+ if (name != NULL) {
if (name != memh->name) MemorY_ErroR(name,"is also corrupt");
}
} else{
@@ -694,13 +694,13 @@
totblock--;
mem_in_use -= memh->len;
- if(memh->mmap) {
+ if (memh->mmap) {
mmap_in_use -= memh->len;
if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
printf("Couldn't unmap memory %s\n", memh->name);
}
else {
- if(malloc_debug_memset && memh->len)
+ if (malloc_debug_memset && memh->len)
memset(memh+1, 255, memh->len);
free(memh);
}
@@ -723,7 +723,7 @@
forw = membase->first;
if (forw) forw = MEMNEXT(forw);
forwok = NULL;
- while(forw){
+ while (forw) {
if (forw->tag1 != MEMTAG1 || forw->tag2 != MEMTAG2) break;
forwok = forw;
if (forw->next) forw = MEMNEXT(forw->next);
@@ -733,7 +733,7 @@
back = (MemHead *) membase->last;
if (back) back = MEMNEXT(back);
backok = NULL;
- while(back){
+ while (back) {
if (back->tag1 != MEMTAG1 || back->tag2 != MEMTAG2) break;
backok = back;
if (back->prev) back = MEMNEXT(back->prev);
@@ -742,13 +742,13 @@
if (forw != back) return ("MORE THAN 1 MEMORYBLOCK CORRUPT");
- if (forw == NULL && back == NULL){
+ if (forw == NULL && back == NULL) {
/* geen foute headers gevonden dan maar op zoek naar memblock*/
forw = membase->first;
if (forw) forw = MEMNEXT(forw);
forwok = NULL;
- while(forw){
+ while (forw) {
if (forw == memh) break;
if (forw->tag1 != MEMTAG1 || forw->tag2 != MEMTAG2) break;
forwok = forw;
@@ -760,7 +760,7 @@
back = (MemHead *) membase->last;
if (back) back = MEMNEXT(back);
backok = NULL;
- while(back){
+ while (back) {
if (back == memh) break;
if (back->tag1 != MEMTAG1 || back->tag2 != MEMTAG2) break;
backok = back;
@@ -772,10 +772,10 @@
if (forwok) name = forwok->nextname;
else name = "No name found";
- if (forw == memh){
+ if (forw == memh) {
/* voor alle zekerheid wordt dit block maar uit de lijst gehaald */
- if (forwok){
- if (backok){
+ if (forwok) {
+ if (backok) {
forwok->next = (MemHead *)&backok->next;
backok->prev = (MemHead *)&forwok->next;
forwok->nextname = backok->name;
@@ -785,7 +785,7 @@
/* membase->last = (struct Link *) &forwok->next; */
}
} else{
- if (backok){
+ if (backok) {
backok->prev = NULL;
membase->first = &backok->next;
} else{
Modified: trunk/blender/intern/mikktspace/mikktspace.c
===================================================================
--- trunk/blender/intern/mikktspace/mikktspace.c 2012-04-28 06:28:07 UTC (rev 46009)
+++ trunk/blender/intern/mikktspace/mikktspace.c 2012-04-28 06:31:57 UTC (rev 46010)
@@ -193,7 +193,7 @@
// this if is important. Due to floating point precision
// averaging when ts0==ts1 will cause a slight difference
// which results in tangent space splits later on
- if(pTS0->fMagS==pTS1->fMagS && pTS0->fMagT==pTS1->fMagT &&
+ if (pTS0->fMagS==pTS1->fMagS && pTS0->fMagT==pTS1->fMagT &&
veq(pTS0->vOs,pTS1->vOs) && veq(pTS0->vOt, pTS1->vOt))
{
ts_res.fMagS = pTS0->fMagS;
@@ -207,8 +207,8 @@
ts_res.fMagT = 0.5f*(pTS0->fMagT+pTS1->fMagT);
ts_res.vOs = vadd(pTS0->vOs,pTS1->vOs);
ts_res.vOt = vadd(pTS0->vOt,pTS1->vOt);
- if( VNotZero(ts_res.vOs) ) ts_res.vOs = Normalize(ts_res.vOs);
- if( VNotZero(ts_res.vOt) ) ts_res.vOt = Normalize(ts_res.vOt);
+ if ( VNotZero(ts_res.vOs) ) ts_res.vOs = Normalize(ts_res.vOs);
+ if ( VNotZero(ts_res.vOt) ) ts_res.vOt = Normalize(ts_res.vOt);
}
return ts_res;
@@ -246,7 +246,7 @@
const float fThresCos = (float) cos((fAngularThreshold*(float)M_PI)/180.0f);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list