[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56299] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Thu Apr 25 18:35:58 CEST 2013
Revision: 56299
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56299
Author: campbellbarton
Date: 2013-04-25 16:35:57 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/rigidbody.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenlib/intern/math_base_inline.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/imbuf/intern/rectop.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
Modified: trunk/blender/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/rigidbody.c 2013-04-25 16:23:23 UTC (rev 56298)
+++ trunk/blender/source/blender/blenkernel/intern/rigidbody.c 2013-04-25 16:35:57 UTC (rev 56299)
@@ -748,11 +748,11 @@
void BKE_rigidbody_world_groups_relink(RigidBodyWorld *rbw)
{
if (rbw->group && rbw->group->id.newid)
- rbw->group = (Group*)rbw->group->id.newid;
+ rbw->group = (Group *)rbw->group->id.newid;
if (rbw->constraints && rbw->constraints->id.newid)
- rbw->constraints = (Group*)rbw->constraints->id.newid;
+ rbw->constraints = (Group *)rbw->constraints->id.newid;
if (rbw->effector_weights->group && rbw->effector_weights->group->id.newid)
- rbw->effector_weights->group = (Group*)rbw->effector_weights->group->id.newid;
+ rbw->effector_weights->group = (Group *)rbw->effector_weights->group->id.newid;
}
/* Add rigid body settings to the specified object */
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2013-04-25 16:23:23 UTC (rev 56298)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2013-04-25 16:35:57 UTC (rev 56299)
@@ -177,7 +177,7 @@
scen->stats = NULL;
scen->fps_info = NULL;
- if(sce->rigidbody_world)
+ if (sce->rigidbody_world)
scen->rigidbody_world = BKE_rigidbody_world_copy(sce->rigidbody_world);
BLI_duplicatelist(&(scen->markers), &(sce->markers));
Modified: trunk/blender/source/blender/blenlib/intern/math_base_inline.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_base_inline.c 2013-04-25 16:23:23 UTC (rev 56298)
+++ trunk/blender/source/blender/blenlib/intern/math_base_inline.c 2013-04-25 16:35:57 UTC (rev 56299)
@@ -149,7 +149,7 @@
* with integers, to avoid gradual darkening when rounding down */
MINLINE int divide_round_i(int a, int b)
{
- return (2*a + b)/(2*b);
+ return (2 * a + b) / (2 * b);
}
MINLINE unsigned int highest_order_bit_i(unsigned int n)
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c 2013-04-25 16:23:23 UTC (rev 56298)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2013-04-25 16:35:57 UTC (rev 56299)
@@ -620,22 +620,22 @@
bool BLI_file_older(const char *file1, const char *file2)
{
#ifdef WIN32
- #ifndef __MINGW32__
+#ifndef __MINGW32__
struct _stat st1, st2;
- #else
+#else
struct _stati64 st1, st2;
- #endif
+#endif
UTF16_ENCODE(file1);
UTF16_ENCODE(file2);
- #ifndef __MINGW32__
+#ifndef __MINGW32__
if (_wstat(file1_16, &st1)) return false;
if (_wstat(file2_16, &st2)) return false;
- #else
+#else
if (_wstati64(file1_16, &st1)) return false;
if (_wstati64(file2_16, &st2)) return false;
- #endif
+#endif
UTF16_UN_ENCODE(file2);
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c 2013-04-25 16:23:23 UTC (rev 56298)
+++ trunk/blender/source/blender/editors/object/object_relations.c 2013-04-25 16:35:57 UTC (rev 56299)
@@ -1648,7 +1648,7 @@
groupn = BKE_group_copy(group);
for (go = groupn->gobject.first; go; go = go->next)
- go->ob = (Object*)go->ob->id.newid;
+ go->ob = (Object *)go->ob->id.newid;
}
}
}
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2013-04-25 16:23:23 UTC (rev 56298)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2013-04-25 16:35:57 UTC (rev 56299)
@@ -703,9 +703,9 @@
cp = (unsigned char *)&col;
/* first mul, then blend the fac */
- cp[0] = divide_round_i(mfac * cp1[0] * 255 + fac * cp2[0] * cp1[0], 255*255);
- cp[1] = divide_round_i(mfac * cp1[1] * 255 + fac * cp2[1] * cp1[1], 255*255);
- cp[2] = divide_round_i(mfac * cp1[2] * 255 + fac * cp2[2] * cp1[2], 255*255);
+ cp[0] = divide_round_i(mfac * cp1[0] * 255 + fac * cp2[0] * cp1[0], 255 * 255);
+ cp[1] = divide_round_i(mfac * cp1[1] * 255 + fac * cp2[1] * cp1[1], 255 * 255);
+ cp[2] = divide_round_i(mfac * cp1[2] * 255 + fac * cp2[2] * cp1[2], 255 * 255);
cp[3] = 255;
return col;
@@ -2780,9 +2780,9 @@
/* to keep tracked of modified loops for shared vertex color blending */
if (brush->vertexpaint_tool == PAINT_BLEND_BLUR) {
- vpd->mlooptag = MEM_mallocN(sizeof(bool)*me->totloop, "VPaintData mlooptag");
+ vpd->mlooptag = MEM_mallocN(sizeof(bool) * me->totloop, "VPaintData mlooptag");
if (vpd->use_fast_update)
- vpd->mfacetag = MEM_mallocN(sizeof(bool)*me->totface*4, "VPaintData mfacetag");
+ vpd->mfacetag = MEM_mallocN(sizeof(bool) * me->totface * 4, "VPaintData mfacetag");
}
/* for filtering */
@@ -2958,10 +2958,10 @@
swap_m4m4(vc->rv3d->persmat, mat);
/* clear modified tag for blur tool */
- if(vpd->mlooptag)
- memset(vpd->mlooptag, 0, sizeof(bool)*me->totloop);
+ if (vpd->mlooptag)
+ memset(vpd->mlooptag, 0, sizeof(bool) * me->totloop);
if (vpd->mfacetag)
- memset(vpd->mfacetag, 0, sizeof(bool)*me->totface*4);
+ memset(vpd->mfacetag, 0, sizeof(bool) * me->totface * 4);
for (index = 0; index < totindex; index++) {
if (indexar[index] && indexar[index] <= me->totpoly) {
Modified: trunk/blender/source/blender/imbuf/intern/rectop.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/rectop.c 2013-04-25 16:23:23 UTC (rev 56298)
+++ trunk/blender/source/blender/imbuf/intern/rectop.c 2013-04-25 16:35:57 UTC (rev 56299)
@@ -66,9 +66,9 @@
temp = cp1[0] + divide_round_i(fac * cp2[0], 255);
if (temp > 254) cp[0] = 255; else cp[0] = temp;
- temp = cp1[1] + divide_round_i(fac * cp2[1] , 255);
+ temp = cp1[1] + divide_round_i(fac * cp2[1], 255);
if (temp > 254) cp[1] = 255; else cp[1] = temp;
- temp = cp1[2] + divide_round_i(fac * cp2[2] , 255);
+ temp = cp1[2] + divide_round_i(fac * cp2[2], 255);
if (temp > 254) cp[2] = 255; else cp[2] = temp;
}
@@ -89,9 +89,9 @@
int mfac = 255 - fac;
/* first mul, then blend the fac */
- cp[0] = divide_round_i((mfac * cp1[0] * 255) + (fac * cp1[0] * cp2[0]), 255*255);
- cp[1] = divide_round_i((mfac * cp1[1] * 255) + (fac * cp1[1] * cp2[1]), 255*255);
- cp[2] = divide_round_i((mfac * cp1[2] * 255) + (fac * cp1[2] * cp2[2]), 255*255);
+ cp[0] = divide_round_i((mfac * cp1[0] * 255) + (fac * cp1[0] * cp2[0]), 255 * 255);
+ cp[1] = divide_round_i((mfac * cp1[1] * 255) + (fac * cp1[1] * cp2[1]), 255 * 255);
+ cp[2] = divide_round_i((mfac * cp1[2] * 255) + (fac * cp1[2] * cp2[2]), 255 * 255);
}
static void blend_color_lighten(char cp[3], const char cp1[3], const char cp2[3], const int fac)
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2013-04-25 16:23:23 UTC (rev 56298)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2013-04-25 16:35:57 UTC (rev 56299)
@@ -2003,7 +2003,7 @@
if (dp->prop->type == PROP_POINTER)
if ((dp->prop->flag & PROP_RNAPTR) && !(dp->prop->flag & PROP_THICK_WRAP))
fprintf(f, "(::%s *) &%s.ptr", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
- else if(dp->prop->flag & PROP_OUTPUT)
+ else if (dp->prop->flag & PROP_OUTPUT)
fprintf(f, "(::%s **) &%s->ptr.data", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
else
fprintf(f, "(::%s *) %s.ptr.data", rna_parameter_type_name(dp->prop), rna_safe_id(dp->prop->identifier));
More information about the Bf-blender-cvs
mailing list