[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55589] trunk/blender/source: style cleanup:
Campbell Barton
ideasman42 at gmail.com
Tue Mar 26 08:29:02 CET 2013
Revision: 55589
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55589
Author: campbellbarton
Date: 2013-03-26 07:29:01 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
style cleanup:
also rename mesh_getVertexCos() --> BKE_mesh_vertexCos_get() to match curve function.
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi_intern.h
trunk/blender/source/blender/blenkernel/BKE_brush.h
trunk/blender/source/blender/blenkernel/BKE_effect.h
trunk/blender/source/blender/blenkernel/BKE_mesh.h
trunk/blender/source/blender/blenkernel/BKE_particle.h
trunk/blender/source/blender/blenkernel/BKE_pbvh.h
trunk/blender/source/blender/blenkernel/BKE_sketch.h
trunk/blender/source/blender/blenkernel/BKE_softbody.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/bmfont.c
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/pbvh.c
trunk/blender/source/blender/blenlib/BLI_fileops.h
trunk/blender/source/blender/blenlib/BLI_math_rotation.h
trunk/blender/source/blender/blenlib/BLI_path_util.h
trunk/blender/source/blender/blenlib/intern/math_color.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/versioning_250.c
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/TransformWriter.cpp
trunk/blender/source/blender/editors/armature/pose_slide.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/include/BIF_glutil.h
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_node/node_intern.h
trunk/blender/source/blender/editors/space_sequencer/sequencer_intern.h
trunk/blender/source/blender/editors/util/crazyspace.c
trunk/blender/source/blender/imbuf/IMB_imbuf.h
trunk/blender/source/blender/imbuf/intern/IMB_filetype.h
trunk/blender/source/blender/imbuf/intern/IMB_indexer.h
trunk/blender/source/blender/imbuf/intern/dds/BlockDXT.cpp
trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp
trunk/blender/source/blender/imbuf/intern/dds/dds_api.cpp
trunk/blender/source/blender/python/mathutils/mathutils.h
trunk/blender/source/blender/quicktime/apple/qtkit_export.m
trunk/blender/source/blender/quicktime/apple/qtkit_import.m
trunk/blender/source/blender/quicktime/quicktime_import.h
trunk/blender/source/blender/render/extern/include/RE_pipeline.h
trunk/blender/source/blender/render/intern/include/raycounter.h
trunk/blender/source/blender/render/intern/include/zbuf.h
trunk/blender/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_internal.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/zbuf.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
trunk/blender/source/gameengine/Expressions/EmptyValue.cpp
trunk/blender/source/gameengine/Expressions/KX_HashedPtr.cpp
trunk/blender/source/gameengine/Expressions/KX_HashedPtr.h
trunk/blender/source/gameengine/Expressions/ListValue.cpp
trunk/blender/source/gameengine/Expressions/Operator1Expr.cpp
trunk/blender/source/gameengine/Expressions/Value.cpp
trunk/blender/source/gameengine/Expressions/VectorValue.cpp
trunk/blender/source/gameengine/Expressions/VectorValue.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
trunk/blender/source/gameengine/GamePlayer/common/bmfont.cpp
trunk/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
trunk/blender/source/gameengine/Ketsji/KX_RayCast.cpp
trunk/blender/source/gameengine/Ketsji/KX_RaySensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.cpp
trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
trunk/blender/source/gameengine/SceneGraph/SG_IObject.h
trunk/blender/source/gameengine/VideoTexture/Exception.cpp
trunk/blender/source/gameengine/VideoTexture/FilterBase.cpp
trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp
trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp
trunk/blender/source/gameengine/VideoTexture/ImageBase.h
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
trunk/blender/source/gameengine/VideoTexture/ImageViewport.h
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
Modified: trunk/blender/source/blender/avi/intern/avi_intern.h
===================================================================
--- trunk/blender/source/blender/avi/intern/avi_intern.h 2013-03-26 06:07:21 UTC (rev 55588)
+++ trunk/blender/source/blender/avi/intern/avi_intern.h 2013-03-26 07:29:01 UTC (rev 55589)
@@ -34,8 +34,8 @@
#include <stdio.h> /* for FILE */
-unsigned int GET_FCC (FILE *fp);
-unsigned int GET_TCC (FILE *fp);
+unsigned int GET_FCC(FILE *fp);
+unsigned int GET_TCC(FILE *fp);
#define PUT_FCC(ch4, fp) \
{ \
Modified: trunk/blender/source/blender/blenkernel/BKE_brush.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_brush.h 2013-03-26 06:07:21 UTC (rev 55588)
+++ trunk/blender/source/blender/blenkernel/BKE_brush.h 2013-03-26 07:29:01 UTC (rev 55589)
@@ -69,7 +69,7 @@
const float pos[2], float jitterpos[2]);
/* brush curve */
-void BKE_brush_curve_preset(struct Brush *b, /*enum CurveMappingPreset*/ int preset);
+void BKE_brush_curve_preset(struct Brush *b, int preset);
float BKE_brush_curve_strength_clamp(struct Brush *br, float p, const float len);
float BKE_brush_curve_strength(struct Brush *br, float p, const float len); /* used for sculpt */
Modified: trunk/blender/source/blender/blenkernel/BKE_effect.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_effect.h 2013-03-26 06:07:21 UTC (rev 55588)
+++ trunk/blender/source/blender/blenkernel/BKE_effect.h 2013-03-26 07:29:01 UTC (rev 55589)
@@ -120,7 +120,7 @@
/* needed for boids */
float effector_falloff(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, struct EffectorWeights *weights);
-int closest_point_on_surface(SurfaceModifierData * surmd, const float co[3], float surface_co[3], float surface_nor[3], float surface_vel[3]);
+int closest_point_on_surface(SurfaceModifierData *surmd, const float co[3], float surface_co[3], float surface_nor[3], float surface_vel[3]);
int get_effector_data(struct EffectorCache *eff, struct EffectorData *efd, struct EffectedPoint *point, int real_velocity);
/* required for particle_system.c */
Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mesh.h 2013-03-26 06:07:21 UTC (rev 55588)
+++ trunk/blender/source/blender/blenkernel/BKE_mesh.h 2013-03-26 07:29:01 UTC (rev 55589)
@@ -221,7 +221,7 @@
/* Return a newly MEM_malloc'd array of all the mesh vertex locations
* (_numVerts_r_ may be NULL) */
-float (*mesh_getVertexCos(struct Mesh *me, int *r_numVerts))[3];
+float (*BKE_mesh_vertexCos_get(struct Mesh *me, int *r_numVerts))[3];
/* map from uv vertex to face (for select linked, stitch, uv suburf) */
Modified: trunk/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_particle.h 2013-03-26 06:07:21 UTC (rev 55588)
+++ trunk/blender/source/blender/blenkernel/BKE_particle.h 2013-03-26 07:29:01 UTC (rev 55589)
@@ -321,7 +321,7 @@
ParticleThread *psys_threads_create(struct ParticleSimulationData *sim);
void psys_threads_free(ParticleThread *threads);
-void psys_make_billboard(ParticleBillboardData * bb, float xvec[3], float yvec[3], float zvec[3], float center[3]);
+void psys_make_billboard(ParticleBillboardData *bb, float xvec[3], float yvec[3], float zvec[3], float center[3]);
void psys_apply_hair_lattice(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys);
/* particle_system.c */
Modified: trunk/blender/source/blender/blenkernel/BKE_pbvh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pbvh.h 2013-03-26 06:07:21 UTC (rev 55588)
+++ trunk/blender/source/blender/blenkernel/BKE_pbvh.h 2013-03-26 07:29:01 UTC (rev 55589)
@@ -163,8 +163,8 @@
void BKE_pbvh_node_get_verts(PBVH *bvh, PBVHNode *node,
int **vert_indices, struct MVert **verts);
-void BKE_pbvh_node_get_BB(PBVHNode * node, float bb_min[3], float bb_max[3]);
-void BKE_pbvh_node_get_original_BB(PBVHNode * node, float bb_min[3], float bb_max[3]);
+void BKE_pbvh_node_get_BB(PBVHNode *node, float bb_min[3], float bb_max[3]);
+void BKE_pbvh_node_get_original_BB(PBVHNode *node, float bb_min[3], float bb_max[3]);
float BKE_pbvh_node_get_tmin(PBVHNode *node);
@@ -181,7 +181,7 @@
/* Update Normals/Bounding Box/Draw Buffers/Redraw and clear flags */
void BKE_pbvh_update(PBVH *bvh, int flags, float (*face_nors)[3]);
-void BKE_pbvh_redraw_BB(PBVH * bvh, float bb_min[3], float bb_max[3]);
+void BKE_pbvh_redraw_BB(PBVH *bvh, float bb_min[3], float bb_max[3]);
void BKE_pbvh_get_grid_updates(PBVH *bvh, int clear, void ***gridfaces, int *totface);
void BKE_pbvh_grids_update(PBVH *bvh, struct CCGElem **grid_elems,
struct DMGridAdjacency *gridadj, void **gridfaces,
Modified: trunk/blender/source/blender/blenkernel/BKE_sketch.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sketch.h 2013-03-26 06:07:21 UTC (rev 55588)
+++ trunk/blender/source/blender/blenkernel/BKE_sketch.h 2013-03-26 07:29:01 UTC (rev 55589)
@@ -126,7 +126,7 @@
void sk_insertStrokePoints(SK_Stroke *stk, SK_Point *pts, int len, int start, int end);
void sk_trimStroke(SK_Stroke *stk, int start, int end);
-void sk_straightenStroke(SK_Stroke * stk, int start, int end, float p_start[3], float p_end[3]);
+void sk_straightenStroke(SK_Stroke *stk, int start, int end, float p_start[3], float p_end[3]);
void sk_polygonizeStroke(SK_Stroke *stk, int start, int end);
void sk_flattenStroke(SK_Stroke *stk, int start, int end);
void sk_reverseStroke(SK_Stroke *stk);
Modified: trunk/blender/source/blender/blenkernel/BKE_softbody.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_softbody.h 2013-03-26 06:07:21 UTC (rev 55588)
+++ trunk/blender/source/blender/blenkernel/BKE_softbody.h 2013-03-26 07:29:01 UTC (rev 55589)
@@ -68,7 +68,7 @@
/* pass NULL to unlink again */
extern void sbSetInterruptCallBack(int (*f)(void));
-extern void SB_estimate_transform(Object * ob, float lloc[3], float lrot[3][3], float lscale[3][3]);
+extern void SB_estimate_transform(Object *ob, float lloc[3], float lrot[3][3], float lscale[3][3]);
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-03-26 06:07:21 UTC (rev 55588)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-03-26 07:29:01 UTC (rev 55589)
@@ -845,7 +845,7 @@
if (mti->type == eModifierTypeType_OnlyDeform) {
int numVerts;
- float (*deformedVerts)[3] = mesh_getVertexCos(me, &numVerts);
+ float (*deformedVerts)[3] = BKE_mesh_vertexCos_get(me, &numVerts);
mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, 0);
dm = mesh_create_derived(me, ob, deformedVerts);
@@ -1451,7 +1451,7 @@
if (mti->type == eModifierTypeType_OnlyDeform && !sculpt_dyntopo) {
if (!deformedVerts)
- deformedVerts = mesh_getVertexCos(me, &numVerts);
+ deformedVerts = BKE_mesh_vertexCos_get(me, &numVerts);
mti->deformVerts(md, ob, NULL, deformedVerts, numVerts, deform_app_flags);
}
@@ -1485,7 +1485,7 @@
if (inputVertexCos)
deformedVerts = inputVertexCos;
else
- deformedVerts = mesh_getVertexCos(me, &numVerts);
+ deformedVerts = BKE_mesh_vertexCos_get(me, &numVerts);
}
@@ -1557,7 +1557,7 @@
dm->getVertCos(dm, deformedVerts);
}
else {
- deformedVerts = mesh_getVertexCos(me, &numVerts);
+ deformedVerts = BKE_mesh_vertexCos_get(me, &numVerts);
}
}
@@ -2441,30 +2441,30 @@
return pMesh->mface[face_num].v4 != 0 ? 4 : 3;
}
-static void GetPosition(const SMikkTSpaceContext *pContext, float fPos[], const int face_num, const int vert_index)
+static void GetPosition(const SMikkTSpaceContext *pContext, float r_co[3], const int face_num, const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData;
const float *co = pMesh->mvert[(&pMesh->mface[face_num].v1)[vert_index]].co;
- copy_v3_v3(fPos, co);
+ copy_v3_v3(r_co, co);
}
-static void GetTextureCoordinate(const SMikkTSpaceContext *pContext, float fUV[], const int face_num, const int vert_index)
+static void GetTextureCoordinate(const SMikkTSpaceContext *pContext, float r_uv[2], const int face_num, const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData;
if (pMesh->mtface != NULL) {
- float *uv = pMesh->mtface[face_num].uv[vert_index];
- fUV[0] = uv[0]; fUV[1] = uv[1];
+ const float *uv = pMesh->mtface[face_num].uv[vert_index];
+ copy_v2_v2(r_uv, uv);
}
else {
const float *orco = pMesh->orco[(&pMesh->mface[face_num].v1)[vert_index]];
- map_to_sphere(&fUV[0], &fUV[1], orco[0], orco[1], orco[2]);
+ map_to_sphere(&r_uv[0], &r_uv[1], orco[0], orco[1], orco[2]);
}
}
-static void GetNormal(const SMikkTSpaceContext *pContext, float fNorm[], const int face_num, const int vert_index)
+static void GetNormal(const SMikkTSpaceContext *pContext, float r_no[3], const int face_num, const int vert_index)
{
//assert(vert_index >= 0 && vert_index < 4);
SGLSLMeshToTangent *pMesh = (SGLSLMeshToTangent *) pContext->m_pUserData;
@@ -2472,29 +2472,29 @@
const int smoothnormal = (pMesh->mface[face_num].flag & ME_SMOOTH);
if (!smoothnormal) { // flat
if (pMesh->precomputedFaceNormals) {
- copy_v3_v3(fNorm, &pMesh->precomputedFaceNormals[3 * face_num]);
+ copy_v3_v3(r_no, &pMesh->precomputedFaceNormals[3 * face_num]);
}
else {
MFace *mf = &pMesh->mface[face_num];
- float *p0 = pMesh->mvert[mf->v1].co;
- float *p1 = pMesh->mvert[mf->v2].co;
- float *p2 = pMesh->mvert[mf->v3].co;
+ const float *p0 = pMesh->mvert[mf->v1].co;
+ const float *p1 = pMesh->mvert[mf->v2].co;
+ const float *p2 = pMesh->mvert[mf->v3].co;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list