[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53671] trunk/blender/source: style cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Jan 9 04:30:16 CET 2013
Revision: 53671
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53671
Author: campbellbarton
Date: 2013-01-09 03:30:15 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/bmesh/intern/bmesh_log.c
trunk/blender/source/blender/compositor/intern/COM_Node.h
trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp
trunk/blender/source/blender/editors/interface/view2d.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.h
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h
trunk/blender/source/blender/makesrna/intern/rna_color.c
trunk/blender/source/blender/makesrna/intern/rna_internal_types.h
trunk/blender/source/blender/python/bmesh/bmesh_py_ops_call.c
trunk/blender/source/blender/python/generic/bpy_internal_import.h
trunk/blender/source/blender/quicktime/quicktime_export.h
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-01-09 03:30:15 UTC (rev 53671)
@@ -272,7 +272,7 @@
ParticleSystem *psys= psys_v;
ParticleData *pa;
BoidParticle *boid;
- float timestep = 0.04f*psys->part->timetweak;
+ float timestep = 0.04f * psys->part->timetweak;
if (index >= psys->totpart)
return;
@@ -333,7 +333,7 @@
ParticleSystem *psys= psys_v;
ParticleData *pa;
ParticleKey keys[4];
- float dfra, timestep = 0.04f*psys->part->timetweak;
+ float dfra, timestep = 0.04f * psys->part->timetweak;
if (index >= psys->totpart)
return;
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-01-09 03:30:15 UTC (rev 53671)
@@ -3340,7 +3340,7 @@
tex->env = newdataadr(fd, tex->env);
if (tex->env) {
tex->env->ima = NULL;
- memset(tex->env->cube, 0, 6*sizeof(void *));
+ memset(tex->env->cube, 0, 6 * sizeof(void *));
tex->env->ok= 0;
}
tex->pd = newdataadr(fd, tex->pd);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_log.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_log.c 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_log.c 2013-01-09 03:30:15 UTC (rev 53671)
@@ -523,14 +523,14 @@
i = 0;
varr = MEM_mallocN(sizeof(int) * bm->totvert, AT);
BM_ITER_MESH (v, &bm_iter, bm, BM_VERTS_OF_MESH) {
- ((unsigned int*)varr)[i++] = bm_log_vert_id_get(log, v);
+ ((unsigned int *)varr)[i++] = bm_log_vert_id_get(log, v);
}
/* Put all face IDs into an array */
i = 0;
farr = MEM_mallocN(sizeof(int) * bm->totface, AT);
BM_ITER_MESH (f, &bm_iter, bm, BM_FACES_OF_MESH) {
- ((unsigned int*)farr)[i++] = bm_log_face_id_get(log, f);
+ ((unsigned int *)farr)[i++] = bm_log_face_id_get(log, f);
}
/* Create BMVert index remap array */
Modified: trunk/blender/source/blender/compositor/intern/COM_Node.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Node.h 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/compositor/intern/COM_Node.h 2013-01-09 03:30:15 UTC (rev 53671)
@@ -58,7 +58,7 @@
* @brief The group node this node belongs to.
* @note: used to find the links in the current subtree for muting nodes
*/
- bNode* m_bNodeGroup;
+ bNode *m_bNodeGroup;
public:
Node(bNode *editorNode, bool create_sockets = true);
@@ -145,8 +145,8 @@
*/
OutputSocket *findOutputSocketBybNodeSocket(bNodeSocket *socket);
- inline void setbNodeGroup(bNode* group) {this->m_bNodeGroup = group;}
- inline bNode* getbNodeGroup() {return this->m_bNodeGroup;}
+ inline void setbNodeGroup(bNode *group) {this->m_bNodeGroup = group;}
+ inline bNode *getbNodeGroup() {return this->m_bNodeGroup;}
protected:
void addPreviewOperation(ExecutionSystem *system, CompositorContext *context, InputSocket *inputSocket);
void addPreviewOperation(ExecutionSystem *system, CompositorContext *context, OutputSocket *outputSocket);
Modified: trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp 2013-01-09 03:30:15 UTC (rev 53671)
@@ -36,8 +36,8 @@
OutputSocket *outputSocket = this->getOutputSocket(0);
DataType datatype = inputSocket->getDataType();
if (inputSocket->isConnected()) {
- SocketConnection * connection = inputSocket->getConnection();
- OutputSocket* otherOutputSocket = connection->getFromSocket();
+ SocketConnection *connection = inputSocket->getConnection();
+ OutputSocket *otherOutputSocket = connection->getFromSocket();
datatype = otherOutputSocket->getDataType();
}
Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/editors/interface/view2d.c 2013-01-09 03:30:15 UTC (rev 53671)
@@ -1694,7 +1694,7 @@
/* draw numbers in the appropriate range */
if (dfac > 0.0f) {
- float h = 0.1f*UI_UNIT_Y + (float)(hor.ymin);
+ float h = 0.1f * UI_UNIT_Y + (float)(hor.ymin);
for (; fac < hor.xmax - 0.5f * U.widget_unit; fac += dfac, val += grid->dx) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c 2013-01-09 03:30:15 UTC (rev 53671)
@@ -1320,7 +1320,7 @@
{
BMIter iter;
BMVert *v;
- BMesh* bm = kcd->em->bm;
+ BMesh *bm = kcd->em->bm;
float max_xyz = 0.0f;
int i;
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/editors/transform/transform.c 2013-01-09 03:30:15 UTC (rev 53671)
@@ -5265,7 +5265,7 @@
if (dot_v3v3(loop_dir[l_nr], dir) < 0.0f) {
swap_v3_v3(sv_array->upvec, sv_array->downvec);
SWAP(BMVert, sv_array->vup, sv_array->vdown);
- SWAP(BMVert*, sv_array->up, sv_array->down);
+ SWAP(BMVert *, sv_array->up, sv_array->down);
}
}
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-01-09 03:30:15 UTC (rev 53671)
@@ -127,30 +127,24 @@
/* ************************** Functions *************************** */
-static int trans_data_compare_dist(const void *A, const void *B)
+static int trans_data_compare_dist(const void *a, const void *b)
{
- const TransData *td_A = (const TransData*)A;
- const TransData *td_B = (const TransData*)B;
+ const TransData *td_a = (const TransData *)a;
+ const TransData *td_b = (const TransData *)b;
- if (td_A->dist < td_B->dist)
- return -1;
- else if (td_A->dist > td_B->dist)
- return 1;
-
- return 0;
+ if (td_a->dist < td_b->dist) return -1;
+ else if (td_a->dist > td_b->dist) return 1;
+ else return 0;
}
-static int trans_data_compare_rdist(const void *A, const void *B)
+static int trans_data_compare_rdist(const void *a, const void *b)
{
- const TransData *td_A = (const TransData*)A;
- const TransData *td_B = (const TransData*)B;
+ const TransData *td_a = (const TransData *)a;
+ const TransData *td_b = (const TransData *)b;
- if (td_A->rdist < td_B->rdist)
- return -1;
- else if (td_A->rdist > td_B->rdist)
- return 1;
-
- return 0;
+ if (td_a->rdist < td_b->rdist) return -1;
+ else if (td_a->rdist > td_b->rdist) return 1;
+ else return 0;
}
void sort_trans_data_dist(TransInfo *t)
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c 2013-01-09 03:30:15 UTC (rev 53671)
@@ -799,7 +799,7 @@
}
-static void stitch_propagate_uv_final_position (UvElement *element, int index, PreviewPosition *preview_position, UVVertAverage *final_position, StitchState *state, char final, Scene* scene)
+static void stitch_propagate_uv_final_position(UvElement *element, int index, PreviewPosition *preview_position, UVVertAverage *final_position, StitchState *state, char final, Scene *scene)
{
StitchPreviewer *preview = state->stitch_preview;
@@ -1392,7 +1392,7 @@
if (state->mode == STITCH_VERT) {
int i;
- state->selection_stack = MEM_mallocN(state->total_separate_edges*sizeof(*state->selection_stack),
+ state->selection_stack = MEM_mallocN(state->total_separate_edges * sizeof(*state->selection_stack),
"stitch_new_edge_selection_stack");
/* check if both elements of an edge are selected */
@@ -1415,7 +1415,7 @@
}
else {
int i;
- state->selection_stack = MEM_mallocN(state->total_separate_uvs*sizeof(*state->selection_stack),
+ state->selection_stack = MEM_mallocN(state->total_separate_uvs * sizeof(*state->selection_stack),
"stitch_new_vert_selection_stack");
for (i = 0; i < old_selection_size; i++) {
Modified: trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.h 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.h 2013-01-09 03:30:15 UTC (rev 53671)
@@ -69,7 +69,7 @@
private:
- Color32 m_color[4*4];
+ Color32 m_color[4 * 4];
};
Modified: trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h 2013-01-09 03:26:39 UTC (rev 53670)
+++ trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h 2013-01-09 03:30:15 UTC (rev 53671)
@@ -172,7 +172,7 @@
void setUserVersion(int version);
void mipmap(Image * img, uint f, uint m);
- void* readData(uint &size);
+ void *readData(uint &size);
// void mipmap(FloatImage * img, uint f, uint m);
void printInfo() const;
Modified: trunk/blender/source/blender/makesrna/intern/rna_color.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list