[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51472] trunk/blender/source: style cleanup: bge, switch statements mostly.
Campbell Barton
ideasman42 at gmail.com
Sun Oct 21 09:58:42 CEST 2012
Revision: 51472
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51472
Author: campbellbarton
Date: 2012-10-21 07:58:38 +0000 (Sun, 21 Oct 2012)
Log Message:
-----------
style cleanup: bge, switch statements mostly.
also left bmesh decimator on in previous commit.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenlib/intern/boxpack2d.c
trunk/blender/source/blender/blenloader/intern/versioning_250.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/EffectExporter.cpp
trunk/blender/source/blender/collada/ImageExporter.cpp
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/render/render_update.c
trunk/blender/source/blender/editors/render/render_view.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
trunk/blender/source/blender/imbuf/intern/dds/PixelFormat.h
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_particle_info.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/quicktime/apple/qtkit_import.m
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertControllers.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertProperties.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp
trunk/blender/source/gameengine/Expressions/BoolValue.cpp
trunk/blender/source/gameengine/Expressions/FloatValue.cpp
trunk/blender/source/gameengine/Expressions/InputParser.cpp
trunk/blender/source/gameengine/Expressions/IntValue.cpp
trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
trunk/blender/source/gameengine/Expressions/StringValue.cpp
trunk/blender/source/gameengine/Expressions/VectorValue.cpp
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
trunk/blender/source/gameengine/Ketsji/BL_Action.cpp
trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp
trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_Light.cpp
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
trunk/blender/source/gameengine/Ketsji/KX_RayCast.cpp
trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-10-21 07:58:38 UTC (rev 51472)
@@ -1050,29 +1050,25 @@
spring->stiffness = 0.0f;
- if(spring->type == CLOTH_SPRING_TYPE_STRUCTURAL)
- {
+ if (spring->type == CLOTH_SPRING_TYPE_STRUCTURAL) {
spring->stiffness = (cloth->verts[spring->kl].struct_stiff + cloth->verts[spring->ij].struct_stiff) / 2.0f;
}
- else if(spring->type == CLOTH_SPRING_TYPE_SHEAR)
- {
+ else if (spring->type == CLOTH_SPRING_TYPE_SHEAR) {
spring->stiffness = (cloth->verts[spring->kl].shear_stiff + cloth->verts[spring->ij].shear_stiff) / 2.0f;
}
- else if(spring->type == CLOTH_SPRING_TYPE_BENDING)
- {
+ else if (spring->type == CLOTH_SPRING_TYPE_BENDING) {
spring->stiffness = (cloth->verts[spring->kl].bend_stiff + cloth->verts[spring->ij].bend_stiff) / 2.0f;
}
- else if(spring->type == CLOTH_SPRING_TYPE_GOAL)
- {
+ else if (spring->type == CLOTH_SPRING_TYPE_GOAL) {
/* Warning: Appending NEW goal springs does not work because implicit solver would need reset! */
/* Activate / Deactivate existing springs */
- if ((!(cloth->verts[spring->ij].flags & CLOTH_VERT_FLAG_PINNED)) && (cloth->verts[spring->ij].goal > ALMOST_ZERO))
+ if ((!(cloth->verts[spring->ij].flags & CLOTH_VERT_FLAG_PINNED)) &&
+ (cloth->verts[spring->ij].goal > ALMOST_ZERO))
{
spring->flags &= ~CLOTH_SPRING_FLAG_DEACTIVATE;
}
- else
- {
+ else {
spring->flags |= CLOTH_SPRING_FLAG_DEACTIVATE;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-10-21 07:58:38 UTC (rev 51472)
@@ -1476,7 +1476,7 @@
}
}
else if (cu->ext1 == 0.0f && cu->ext2 == 0.0f) {
- ;
+ /* pass */
}
else if (cu->ext2 == 0.0f) {
dl = MEM_callocN(sizeof(DispList), "makebevelcurve2");
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-10-21 07:58:38 UTC (rev 51472)
@@ -711,7 +711,7 @@
int i = 0;
/* Clear matrix from old vertex constraints */
- for(i = 0; i < S[0].vcount; i++)
+ for (i = 0; i < S[0].vcount; i++)
S[i].c = S[i].r = 0;
/* Set new vertex constraints */
@@ -1662,7 +1662,7 @@
while (search) {
// only handle active springs
ClothSpring *spring = search->link;
- if( !(spring->flags & CLOTH_SPRING_FLAG_DEACTIVATE))
+ if (!(spring->flags & CLOTH_SPRING_FLAG_DEACTIVATE))
cloth_calc_spring_force(clmd, search->link, lF, lX, lV, dFdV, dFdX, time);
search = search->next;
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2012-10-21 07:58:38 UTC (rev 51472)
@@ -982,14 +982,16 @@
if (ma->nodetree && ma->use_nodes)
ntreeShaderGetTexcoMode(ma->nodetree, r_mode, &ma->texco, &ma->mode_l);
- /* local group override */
- if((ma->shade_flag & MA_GROUP_LOCAL) && ma->id.lib && ma->group && ma->group->id.lib) {
- Group *group;
+ /* local group override */
+ if ((ma->shade_flag & MA_GROUP_LOCAL) && ma->id.lib && ma->group && ma->group->id.lib) {
+ Group *group;
- for(group= G.main->group.first; group; group= group->id.next)
- if(!group->id.lib && strcmp(group->id.name, ma->group->id.name) == 0)
- ma->group = group;
- }
+ for (group = G.main->group.first; group; group = group->id.next) {
+ if (!group->id.lib && strcmp(group->id.name, ma->group->id.name) == 0) {
+ ma->group = group;
+ }
+ }
+ }
}
static void init_render_nodetree(bNodeTree *ntree, Material *basemat, int r_mode, float *amb)
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-10-21 07:58:38 UTC (rev 51472)
@@ -691,7 +691,7 @@
sds->dx = ch_dx;
VECCOPY(sds->res, ch_res);
sds->total_cells = ch_res[0]*ch_res[1]*ch_res[2];
- if(sds->flags & MOD_SMOKE_HIGHRES) {
+ if (sds->flags & MOD_SMOKE_HIGHRES) {
smoke_reallocate_highres_fluid(sds, ch_dx, ch_res, 1);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-10-21 07:58:38 UTC (rev 51472)
@@ -640,7 +640,6 @@
tsmd->flow->flags = smd->flow->flags;
}
else if (tsmd->coll) {
- ;
/* leave it as initialized, collision settings is mostly caches */
}
}
@@ -699,7 +698,7 @@
numverts = dm->getNumVerts(dm);
// DG TODO
- // if(scs->type > SM_COLL_STATIC)
+ // if (scs->type > SM_COLL_STATIC)
// if line above is used, the code is in trouble if the object moves but is declared as "does not move"
{
Modified: trunk/blender/source/blender/blenlib/intern/boxpack2d.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2012-10-21 07:58:38 UTC (rev 51472)
@@ -73,7 +73,7 @@
((b)->v[BR]->x = (b)->v[TR]->x)
#define UPDATE_V34Y(b) ((b)->v[TL]->y = (b)->v[TR]->y); \
((b)->v[BR]->y = (b)->v[BL]->y)
-
+
/* UNUSED */
// #define UPDATE_V34(b) UPDATE_V34X(b); UPDATE_V34Y(b)
Modified: trunk/blender/source/blender/blenloader/intern/versioning_250.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_250.c 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/blenloader/intern/versioning_250.c 2012-10-21 07:58:38 UTC (rev 51472)
@@ -2062,7 +2062,7 @@
{
brush->add_col[0] = 1.00f;
brush->add_col[1] = 0.39f;
- brush->add_col[2] = 0.39f;
+ brush->add_col[2] = 0.39f;
}
if (brush->sub_col[0] == 0 &&
Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-10-21 07:58:38 UTC (rev 51472)
@@ -84,7 +84,7 @@
BLI_INLINE BMDiskLink *rs_edge_link_get(BMEdge *e, BMVert *v, EdgeData *e_data)
{
return v == ((BMEdge *)e)->v1 ? &(((EdgeData *)e_data)->v1_disk_link) :
- &(((EdgeData *)e_data)->v2_disk_link) ;
+ &(((EdgeData *)e_data)->v2_disk_link);
}
static int rotsys_append_edge(BMEdge *e, BMVert *v,
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2012-10-21 07:58:38 UTC (rev 51472)
@@ -265,7 +265,7 @@
MEM_freeN(eul);
MEM_freeN(eul_axis);
}
- else if(!strcmp(transformName, "lens") && (ob->type == OB_CAMERA)) {
+ else if (!strcmp(transformName, "lens") && (ob->type == OB_CAMERA)) {
output_id = create_lens_source_from_fcurve((Camera *) ob->data, COLLADASW::InputSemantic::OUTPUT, fcu, anim_id);
}
else {
Modified: trunk/blender/source/blender/collada/AnimationImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationImporter.cpp 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/collada/AnimationImporter.cpp 2012-10-21 07:58:38 UTC (rev 51472)
@@ -854,14 +854,13 @@
{
double aspect = camera->getAspectRatio().getValue();
- if(aspect == 0)
- {
+ if (aspect == 0) {
const double yfov = camera->getYFov().getValue();
- if(yfov == 0)
- aspect=1; // assume yfov and xfov are equal
- else
- {
+ if (yfov == 0) {
+ aspect = 1; // assume yfov and xfov are equal
+ }
+ else {
const double xfov = camera->getXFov().getValue();
if (xfov==0)
aspect = 1;
@@ -885,7 +884,7 @@
COLLADAFW::Node *root = root_map.find(uid) == root_map.end() ? node : root_map[uid];
Object *ob;
- if(is_joint)
+ if (is_joint)
ob = armature_importer->get_armature_for_joint(root);
else
ob = object_map.find(uid) == object_map.end() ? NULL : object_map.find(uid)->second;
Modified: trunk/blender/source/blender/collada/EffectExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/EffectExporter.cpp 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/collada/EffectExporter.cpp 2012-10-21 07:58:38 UTC (rev 51472)
@@ -381,7 +381,7 @@
}
std::set<Image *>::iterator uv_t_iter;
- for(uv_t_iter = uv_textures.begin(); uv_t_iter != uv_textures.end(); uv_t_iter++ ) {
+ for (uv_t_iter = uv_textures.begin(); uv_t_iter != uv_textures.end(); uv_t_iter++ ) {
Image *ima = *uv_t_iter;
std::string key(id_name(ima));
key = translate_id(key);
Modified: trunk/blender/source/blender/collada/ImageExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ImageExporter.cpp 2012-10-21 05:46:41 UTC (rev 51471)
+++ trunk/blender/source/blender/collada/ImageExporter.cpp 2012-10-21 07:58:38 UTC (rev 51472)
@@ -62,7 +62,7 @@
if (not_yet_exported) {
ImBuf *imbuf = BKE_image_get_ibuf(image, NULL);
- if(!imbuf) {
+ if (!imbuf) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list