[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50953] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Sep 30 08:12:47 CEST 2012
Revision: 50953
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50953
Author: campbellbarton
Date: 2012-09-30 06:12:47 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/DLRB_tree.c
trunk/blender/source/blender/blenlib/intern/string_utf8.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.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_file/space_file.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_info/space_info.c
trunk/blender/source/blender/editors/space_userpref/space_userpref.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/python/intern/bpy_util.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/sunsky.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
===================================================================
--- trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -188,7 +188,7 @@
SOCKET s_in;
char buf[256];
struct sockaddr_in addr;
- FILE* fp;
+ FILE *fp;
p = lpFileName;
while (*p && *p != '.') p++;
@@ -229,7 +229,7 @@
return VF_ERROR;
}
- rval = (conndesc*) malloc(sizeof(conndesc));
+ rval = (conndesc *) malloc(sizeof(conndesc));
rval->addr = addr;
@@ -281,7 +281,7 @@
HRESULT __stdcall VF_CloseFileFunc_Blen(
VF_FileHandle hFileHandle )
{
- free((conndesc*) hFileHandle);
+ free((conndesc *) hFileHandle);
return VF_OK;
}
@@ -290,7 +290,7 @@
VF_FileHandle hFileHandle,
LPVF_FileInfo lpFileInfo )
{
- conndesc * c = (conndesc*) hFileHandle;
+ conndesc *c = (conndesc *) hFileHandle;
if (c == 0) {
return VF_ERROR;
}
@@ -385,10 +385,10 @@
framebuf = (unsigned char*) v->lpData;
for (y = 0; y < height; y++) {
- unsigned char * p = framebuf + v->lPitch * y;
- unsigned char * e = p + width * 3;
+ unsigned char *p = framebuf + v->lPitch * y;
+ unsigned char *e = p + width * 3;
- my_recv(s_in, (char*) p, width * 3);
+ my_recv(s_in, (char *)p, width * 3);
while (p != e) {
unsigned char tmp = p[2];
p[2] = p[0];
Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -529,7 +529,7 @@
unsigned char *dst, crgb[3];
const float alpha = BKE_brush_alpha_get(scene, brush);
float brush_rgb[3];
-
+
imbflag = (flt) ? IB_rectfloat : IB_rect;
xoff = -bufsize / 2.0f + 0.5f;
yoff = -bufsize / 2.0f + 0.5f;
@@ -563,7 +563,7 @@
else {
BKE_brush_sample_tex(scene, brush, xy, rgba, 0);
mul_v3_v3v3(dstf, rgba, brush_rgb);
- dstf[3] = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
+ dstf[3] = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
}
}
}
@@ -594,7 +594,7 @@
else if (texfall == 2) {
BKE_brush_sample_tex(scene, brush, xy, rgba, 0);
mul_v3_v3(rgba, brush->rgb);
- alpha_f = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
+ alpha_f = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
rgb_float_to_uchar(dst, rgba);
@@ -602,7 +602,7 @@
}
else {
BKE_brush_sample_tex(scene, brush, xy, rgba, 0);
- alpha_f = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
+ alpha_f = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
dst[0] = crgb[0];
dst[1] = crgb[1];
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -4224,7 +4224,7 @@
/* Only continue if surrounding point has higher wetness */
if (ePoint->wetness < pPoint->wetness || ePoint->wetness < MIN_WETNESS) continue;
- w_factor = 1.0f / numOfNeighs *MIN2(ePoint->wetness, 1.0f) * speed_scale;
+ w_factor = 1.0f / numOfNeighs * MIN2(ePoint->wetness, 1.0f) * speed_scale;
CLAMP(w_factor, 0.0f, 1.0f);
/* mix new wetness and color */
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -1765,7 +1765,7 @@
/* Any actuators set to ACT_IPO at this point are actually Action Actuators that
need this converted IPO to finish converting the actuator. */
if (act->type == ACT_IPO) {
- aa = (bActionActuator*)act->data;
+ aa = (bActionActuator *)act->data;
aa->act = ob->adt->action;
act->type = ACT_ACTION;
}
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -1327,9 +1327,9 @@
r_col[2] = facm * (r_col[2]) + fac * (r_col[2]) / col[2];
break;
case MA_RAMP_DIFF:
- r_col[0] = facm * (r_col[0]) + fac *fabsf(r_col[0] - col[0]);
- r_col[1] = facm * (r_col[1]) + fac *fabsf(r_col[1] - col[1]);
- r_col[2] = facm * (r_col[2]) + fac *fabsf(r_col[2] - col[2]);
+ r_col[0] = facm * (r_col[0]) + fac * fabsf(r_col[0] - col[0]);
+ r_col[1] = facm * (r_col[1]) + fac * fabsf(r_col[1] - col[1]);
+ r_col[2] = facm * (r_col[2]) + fac * fabsf(r_col[2] - col[2]);
break;
case MA_RAMP_DARK:
tmp = col[0] + ((1 - col[0]) * facm);
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -3776,7 +3776,7 @@
ptex->gravity = ptex->field = ptex->time = ptex->clump = ptex->kink =
ptex->effector = ptex->rough1 = ptex->rough2 = ptex->roughe = 1.f;
- ptex->length = 1.0f - part->randlength *PSYS_FRAND(child_index + 26);
+ ptex->length = 1.0f - part->randlength * PSYS_FRAND(child_index + 26);
ptex->length *= part->clength_thres < PSYS_FRAND(child_index + 27) ? part->clength : 1.0f;
for (m = 0; m < MAX_MTEX; m++, mtexp++) {
@@ -3968,7 +3968,7 @@
size *= part->childsize;
if (part->childrandsize != 0.0f)
- size *= 1.0f - part->childrandsize *PSYS_FRAND(cpa - psys->child + 26);
+ size *= 1.0f - part->childrandsize * PSYS_FRAND(cpa - psys->child + 26);
return size;
}
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -705,8 +705,8 @@
BVHNode *tmp = branches_array + 0;
tmp->parent = NULL;
- /*Most of bvhtree code relies on 1-leaf trees having at least one branch
- *We handle that special case here */
+ /* Most of bvhtree code relies on 1-leaf trees having at least one branch
+ * We handle that special case here */
if (num_leafs == 1) {
BVHNode *root = branches_array + 0;
refit_kdop_hull(tree, root, 0, num_leafs);
Modified: trunk/blender/source/blender/blenlib/intern/DLRB_tree.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/DLRB_tree.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/source/blender/blenlib/intern/DLRB_tree.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -364,7 +364,7 @@
root_slot = &root->parent->right;
}
else
- root_slot = ((DLRBT_Node **)&tree->root); /* &((DLRBT_Node*)tree->root); */
+ root_slot = ((DLRBT_Node **)&tree->root); /* &((DLRBT_Node *)tree->root); */
/* - pivot's right child becomes root's left child
* - root now becomes pivot's right child
Modified: trunk/blender/source/blender/blenlib/intern/string_utf8.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string_utf8.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/source/blender/blenlib/intern/string_utf8.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -58,11 +58,11 @@
int BLI_utf8_invalid_byte(const char *str, int length)
{
- const unsigned char *p, *pend = (unsigned char*)str + length;
+ const unsigned char *p, *pend = (unsigned char *)str + length;
unsigned char c;
int ab;
- for (p = (unsigned char*)str; p < pend; p++) {
+ for (p = (unsigned char *)str; p < pend; p++) {
c = *p;
if (c < 128)
continue;
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-09-30 05:29:27 UTC (rev 50952)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-09-30 06:12:47 UTC (rev 50953)
@@ -665,7 +665,7 @@
/* Verts' pointers, only edge pointers... */
if (eptr_map) {
BM_ITER_MESH (ve, &iter, bm, BM_VERTS_OF_MESH) {
-/* printf("Vert e: %p -> %p\n", ve->e, BLI_ghash_lookup(eptr_map, (const void*)ve->e));*/
+/* printf("Vert e: %p -> %p\n", ve->e, BLI_ghash_lookup(eptr_map, (const void *)ve->e));*/
ve->e = BLI_ghash_lookup(eptr_map, (const void *)ve->e);
}
}
@@ -675,20 +675,20 @@
if (vptr_map || eptr_map) {
BM_ITER_MESH (ed, &iter, bm, BM_EDGES_OF_MESH) {
if (vptr_map) {
-/* printf("Edge v1: %p -> %p\n", ed->v1, BLI_ghash_lookup(vptr_map, (const void*)ed->v1));*/
-/* printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void*)ed->v2));*/
+/* printf("Edge v1: %p -> %p\n", ed->v1, BLI_ghash_lookup(vptr_map, (const void *)ed->v1));*/
+/* printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void* )ed->v2));*/
ed->v1 = BLI_ghash_lookup(vptr_map, (const void *)ed->v1);
ed->v2 = BLI_ghash_lookup(vptr_map, (const void *)ed->v2);
}
if (eptr_map) {
/* printf("Edge v1_disk_link prev: %p -> %p\n", ed->v1_disk_link.prev,*/
-/* BLI_ghash_lookup(eptr_map, (const void*)ed->v1_disk_link.prev));*/
+/* BLI_ghash_lookup(eptr_map, (const void *)ed->v1_disk_link.prev));*/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list