[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51493] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Mon Oct 22 10:15:54 CEST 2012
Revision: 51493
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51493
Author: campbellbarton
Date: 2012-10-22 08:15:51 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/container/CTR_TaggedIndex.h
trunk/blender/intern/container/CTR_TaggedSetOps.h
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/effect.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/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/sca.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenlib/intern/BLI_heap.c
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/blenlib/intern/string_utf8.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/bmesh/intern/bmesh_decimate.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.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_view3d/drawmesh.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/makesdna/DNA_genfile.h
trunk/blender/source/blender/makesdna/intern/dna_genfile.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_boxmask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_brightness.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_composite.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_crop.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_curves.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_defocus.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_despeckle.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_displace.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_filter.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_flip.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_gamma.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_glare.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_idMask.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_invert.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_lensdist.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_levels.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapUV.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mapValue.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_math.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normal.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_normalize.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_premulkey.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_setalpha.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_switch.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_texture.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_tonemap.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_translate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_value.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_zcombine.c
trunk/blender/source/blender/nodes/intern/node_exec.c
trunk/blender/source/blender/nodes/shader/node_shader_util.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_add_shader.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_attribute.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_background.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_brightness.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_transparent.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_bump.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_emission.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_fresnel.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_gamma.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_geometry.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_holdout.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_light_path.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_normal.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_object_info.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_material.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_output_world.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_rgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_squeeze.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_value.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_at.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_bricks.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_checker.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_compose.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_coord.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_curves.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_decompose.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_distance.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_image.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_invert.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_math.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_output.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_proc.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_rotate.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_scale.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_translate.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToNor.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp
trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.cpp
trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
trunk/blender/source/gameengine/Expressions/ListValue.cpp
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp
trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
trunk/blender/source/gameengine/GameLogic/SCA_ISensor.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/GameLogic/SCA_RandomSensor.cpp
trunk/blender/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
trunk/blender/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
trunk/blender/source/gameengine/Ketsji/BL_BlenderShader.cpp
trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp
trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_Light.cpp
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
trunk/blender/source/gameengine/Ketsji/KX_PyMath.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_TexVert.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_texmatrix.cpp
trunk/blender/source/tests/rna_array.py
trunk/blender/source/tools/MakeCursor.py
Modified: trunk/blender/intern/container/CTR_TaggedIndex.h
===================================================================
--- trunk/blender/intern/container/CTR_TaggedIndex.h 2012-10-22 07:57:21 UTC (rev 51492)
+++ trunk/blender/intern/container/CTR_TaggedIndex.h 2012-10-22 08:15:51 UTC (rev 51493)
@@ -29,13 +29,6 @@
* \ingroup ctr
*/
-
-/**
-
- * Copyright (C) 2001 NaN Technologies B.V.
- * Simple tagged index class.
- */
-
#ifndef __CTR_TAGGEDINDEX_H__
#define __CTR_TAGGEDINDEX_H__
@@ -53,7 +46,6 @@
#include "MEM_sys_types.h"
enum {
-
empty_tag = 0x0,
empty_index = 0xffffffff
};
@@ -191,7 +183,7 @@
return (Tag() == Empty().Tag());
}
- // functionals
+ /* functionals */
struct greater : std::binary_function<CTR_TaggedIndex, CTR_TaggedIndex, bool>
{
@@ -213,7 +205,6 @@
unsigned int m_val;
-};
+};
-#endif
-
+#endif /* __CTR_TAGGEDINDEX_H__ */
Modified: trunk/blender/intern/container/CTR_TaggedSetOps.h
===================================================================
--- trunk/blender/intern/container/CTR_TaggedSetOps.h 2012-10-22 07:57:21 UTC (rev 51492)
+++ trunk/blender/intern/container/CTR_TaggedSetOps.h 2012-10-22 08:15:51 UTC (rev 51493)
@@ -50,16 +50,16 @@
* type ObjectType must have the following public methods to be used by
* this template class:
*
- * int
+ * int
* OpenTag(void) --- return a persistent tag value for the primitive
*
- * void
+ * void
* SetOpenTag(int bla) --- set the persistent tag value for this primitive to bla.
*
- * bool
+ * bool
* SelectTag() --- return a persistent boolean tag for this primitive
*
- * void
+ * void
* SetSelectTag(bool bla) --- set the persistent boolean tag for this primitive to bla.
*
* Here persistent means that the tag should be associated with the object for the
@@ -86,16 +86,16 @@
unsigned int shift
) {
- // iterate through vectors in index_list
- // iterate through individual members of each vector
- // mark each obejct that the index points to
+ /* iterate through vectors in index_list
+ * iterate through individual members of each vector
+ * mark each obejct that the index points to */
typename std::vector< std::vector<IndexType> >::const_iterator
last_vector = index_list.end();
typename std::vector< std::vector<IndexType> >::const_iterator
start_vector = index_list.begin();
- // FIXME some temporary space
+ /* FIXME some temporary space */
std::vector<IndexType> temp_union;
temp_union.reserve(64);
@@ -114,7 +114,7 @@
ObjectType & prim = primitives[*start_index];
if (!prim.OpenTag()) {
- // compute the union
+ /* compute the union */
temp_union.push_back(*start_index);
}
int tag = prim.OpenTag();
@@ -126,7 +126,7 @@
++tag_num;
}
- // now iterate through the union and pull out all those with the right tag
+ /* now iterate through the union and pull out all those with the right tag */
typename std::vector<IndexType>::const_iterator last_index =
temp_union.end();
@@ -138,20 +138,20 @@
ObjectType & prim = primitives[*start_index];
if (prim.OpenTag() == tag_num) {
- //it's part of the intersection!
+ /* it's part of the intersection! */
output.push_back(*start_index);
- // because we're iterating through the union
- // it's safe to remove the tag at this point
+ /* because we're iterating through the union
+ * it's safe to remove the tag at this point */
prim.SetOpenTag(prim.OpenTag() & ~mask);
}
}
};
- // note not a strict set intersection!
- // if x appears twice in b and is part of the intersection
- // it will appear twice in the intersection
+ /* note not a strict set intersection!
+ * if x appears twice in b and is part of the intersection
+ * it will appear twice in the intersection */
static
void
@@ -180,7 +180,7 @@
output.push_back(*start_index);
}
}
- // deselect
+ /* deselect */
last_index = a.end();
start_index = a.begin();
@@ -199,9 +199,9 @@
std::vector<IndexType> &output
) {
- // iterate through vectors in index_list
- // iterate through individual members of each vector
- // mark each obejct that the index points to
+ /* iterate through vectors in index_list
+ * iterate through individual members of each vector
+ * mark each obejct that the index points to */
typename std::vector< std::vector<IndexType> >::const_iterator
last_vector = index_list.end();
@@ -220,15 +220,15 @@
ObjectType & prim = primitives[*start_index];
if (!prim.SelectTag()) {
- // compute the union
+ /* compute the union */
output.push_back(*start_index);
prim.SetSelectTag(true);
}
}
}
- // now iterate through the union and reset the tags
-
+ /* now iterate through the union and reset the tags */
+
typename std::vector<IndexType>::const_iterator last_index =
output.end();
typename std::vector<IndexType>::iterator start_index =
@@ -238,7 +238,7 @@
ObjectType & prim = primitives[*start_index];
prim.SetSelectTag(false);
- }
+ }
}
@@ -251,8 +251,8 @@
std::vector< IndexType> &output
) {
- // iterate through b mark all
- // iterate through a and add to output all unmarked
+ /* iterate through b mark all
+ * iterate through a and add to output all unmarked */
typename std::vector<IndexType>::const_iterator last_index =
b.end();
@@ -276,7 +276,7 @@
}
}
- // clean up the tags
+ /* clean up the tags */
last_index = b.end();
start_index = b.begin();
@@ -290,12 +290,11 @@
private :
- // private constructor - this class is not meant for
- // instantiation
+ /* private constructor - this class is not meant for
+ * instantiation */
CTR_TaggedSetOps();
};
-#endif
-
+#endif /* __CTR_TAGGEDSETOPS_H__ */
Modified: trunk/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/boids.c 2012-10-22 07:57:21 UTC (rev 51492)
+++ trunk/blender/source/blender/blenkernel/intern/boids.c 2012-10-22 08:15:51 UTC (rev 51493)
@@ -956,7 +956,8 @@
// }
//}
- bbd->wanted_co[0]=bbd->wanted_co[1]=bbd->wanted_co[2]=bbd->wanted_speed=0.0f;
+ zero_v3(bbd->wanted_co);
+ bbd->wanted_speed = 0.0f;
/* create random seed for every particle & frame */
rand = (int)(PSYS_FRAND(psys->seed + p) * 1000);
@@ -990,7 +991,8 @@
add_v3_v3(wanted_co, bbd->wanted_co);
wanted_speed += bbd->wanted_speed;
n++;
- bbd->wanted_co[0]=bbd->wanted_co[1]=bbd->wanted_co[2]=bbd->wanted_speed=0.0f;
+ zero_v3(bbd->wanted_co);
+ bbd->wanted_speed = 0.0f;
}
}
@@ -1266,9 +1268,9 @@
{
float grav[3];
- grav[0]= 0.0f;
- grav[1]= 0.0f;
- grav[2]= bbd->sim->scene->physics_settings.gravity[2] < 0.0f ? -1.0f : 0.0f;
+ grav[0] = 0.0f;
+ grav[1] = 0.0f;
+ grav[2] = bbd->sim->scene->physics_settings.gravity[2] < 0.0f ? -1.0f : 0.0f;
/* don't take forward acceleration into account (better banking) */
if (dot_v3v3(bpa->data.acc, pa->state.vel) > 0.0f) {
@@ -1309,9 +1311,9 @@
{
float grav[3];
- grav[0]= 0.0f;
- grav[1]= 0.0f;
- grav[2]= bbd->sim->scene->physics_settings.gravity[2] < 0.0f ? -1.0f : 0.0f;
+ grav[0] = 0.0f;
+ grav[1] = 0.0f;
+ grav[2] = bbd->sim->scene->physics_settings.gravity[2] < 0.0f ? -1.0f : 0.0f;
/* gather apparent gravity */
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-10-22 07:57:21 UTC (rev 51492)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-10-22 08:15:51 UTC (rev 51493)
@@ -824,7 +824,7 @@
int i = 0;
MVert *mvert = NULL;
ClothVertex *verts = NULL;
- float (*shapekey_rest)[3]= NULL;
+ float (*shapekey_rest)[3] = NULL;
float tnull[3] = {0, 0, 0};
Cloth *cloth = NULL;
float maxdist = 0;
Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c 2012-10-22 07:57:21 UTC (rev 51492)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c 2012-10-22 08:15:51 UTC (rev 51493)
@@ -828,7 +828,7 @@
{
PartDeflect *pd = eff->pd;
RNG *rng = pd->rng;
- float force[3]={0, 0, 0};
+ float force[3] = {0, 0, 0};
float temp[3];
float fac;
float strength = pd->f_strength;
@@ -1020,7 +1020,7 @@
do_texture_effector(eff, &efd, point, force);
}
else {
- float temp1[3]={0, 0, 0}, temp2[3];
+ float temp1[3] = {0, 0, 0}, temp2[3];
copy_v3_v3(temp1, force);
do_physical_effector(eff, &efd, point, force);
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-10-22 07:57:21 UTC (rev 51492)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-10-22 08:15:51 UTC (rev 51493)
@@ -1218,7 +1218,7 @@
float stretch_force[3] = {0, 0, 0};
float bending_force[3] = {0, 0, 0};
float damping_force[3] = {0, 0, 0};
- float nulldfdx[3][3]={ {0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
+ float nulldfdx[3][3] = {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
float scaling = 0.0;
@@ -1356,15 +1356,15 @@
{
float n1[3], n2[3];
- n1[0]= v1[0]-v2[0];
- n2[0]= v2[0]-v3[0];
- n1[1]= v1[1]-v2[1];
- n2[1]= v2[1]-v3[1];
- n1[2]= v1[2]-v2[2];
- n2[2]= v2[2]-v3[2];
- n[0]= n1[1]*n2[2]-n1[2]*n2[1];
- n[1]= n1[2]*n2[0]-n1[0]*n2[2];
- n[2]= n1[0]*n2[1]-n1[1]*n2[0];
+ n1[0] = v1[0]-v2[0];
+ n2[0] = v2[0]-v3[0];
+ n1[1] = v1[1]-v2[1];
+ n2[1] = v2[1]-v3[1];
+ n1[2] = v1[2]-v2[2];
+ n2[2] = v2[2]-v3[2];
+ n[0] = n1[1]*n2[2]-n1[2]*n2[1];
+ n[1] = n1[2]*n2[0]-n1[0]*n2[2];
+ n[2] = n1[0]*n2[1]-n1[1]*n2[0];
}
static void CalcFloat4( float *v1, float *v2, float *v3, float *v4, float *n)
@@ -1372,17 +1372,17 @@
/* real cross! */
float n1[3], n2[3];
- n1[0]= v1[0]-v3[0];
- n1[1]= v1[1]-v3[1];
- n1[2]= v1[2]-v3[2];
+ n1[0] = v1[0]-v3[0];
+ n1[1] = v1[1]-v3[1];
+ n1[2] = v1[2]-v3[2];
- n2[0]= v2[0]-v4[0];
- n2[1]= v2[1]-v4[1];
- n2[2]= v2[2]-v4[2];
+ n2[0] = v2[0]-v4[0];
+ n2[1] = v2[1]-v4[1];
+ n2[2] = v2[2]-v4[2];
- n[0]= n1[1]*n2[2]-n1[2]*n2[1];
- n[1]= n1[2]*n2[0]-n1[0]*n2[2];
- n[2]= n1[0]*n2[1]-n1[1]*n2[0];
+ n[0] = n1[1]*n2[2]-n1[2]*n2[1];
+ n[1] = n1[2]*n2[0]-n1[0]*n2[2];
+ n[2] = n1[0]*n2[1]-n1[1]*n2[0];
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list