Revision: 48253
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48253
Author: campbellbarton
Date: 2012-06-25 07:24:48 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/doc/python_api/examples/bpy.types.Mesh.py
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenlib/BLI_array.h
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/blender/python/intern/stubs.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/doc/python_api/examples/bpy.types.Mesh.py
===================================================================
--- trunk/blender/doc/python_api/examples/bpy.types.Mesh.py 2012-06-25
07:24:01 UTC (rev 48252)
+++ trunk/blender/doc/python_api/examples/bpy.types.Mesh.py 2012-06-25
07:24:48 UTC (rev 48253)
@@ -17,7 +17,7 @@
only a reference to loops that the polygon uses.
:class:`Mesh.loops`, :class:`Mesh.uv_layers` :class:`Mesh.vertex_colors` are
all aligned so the same polygon loop
-indicies can be used to find the UV's and vertex colors as with as the
vertices.
+indices can be used to find the UV's and vertex colors as with as the vertices.
To compare mesh API options see: :ref:`NGons and Tessellation Faces
<info_gotcha_mesh_faces>`
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-06-25 07:24:01 UTC (rev 48252)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-06-25 07:24:48 UTC (rev 48253)
@@ -734,7 +734,7 @@
/* deactivate zero axises */
for (i = 0; i < 3; i++) {
- if (td[i] < min_dim) {td[i] = 1.0f; axis -= 1; }
+ if (td[i] < min_dim) { td[i] = 1.0f; axis -= 1; }
}
if (axis == 0 || MAX3(td[0], td[1], td[2]) < 0.0001f) {
@@ -2016,11 +2016,11 @@
/* Dist to second edge */
t_dist = dist_to_line_segment_v2(pixel,
tface[cPoint->face_index].uv[uindex[1]],
tface[cPoint->face_index].uv[uindex[2]]);
- if (t_dist < dist) {e1_index = cPoint->v2; e2_index =
cPoint->v3; edge1_index = uindex[1]; edge2_index = uindex[2]; dist = t_dist; }
+ if (t_dist < dist) { e1_index = cPoint->v2; e2_index =
cPoint->v3; edge1_index = uindex[1]; edge2_index = uindex[2]; dist = t_dist; }
/* Dist to third edge */
t_dist = dist_to_line_segment_v2(pixel,
tface[cPoint->face_index].uv[uindex[2]],
tface[cPoint->face_index].uv[uindex[0]]);
- if (t_dist < dist) {e1_index = cPoint->v3; e2_index =
cPoint->v1; edge1_index = uindex[2]; edge2_index = uindex[0]; dist = t_dist; }
+ if (t_dist < dist) { e1_index = cPoint->v3; e2_index =
cPoint->v1; edge1_index = uindex[2]; edge2_index = uindex[0]; dist = t_dist; }
/*
@@ -2284,7 +2284,7 @@
u = (dot11 * dot02 - dot01 *
dot12) * invDenom;
v = (dot00 * dot12 - dot01 *
dot02) * invDenom;
- if ((u > 0) && (v > 0) && (u +
v < 1)) {isInside = 1; } /* is inside a triangle */
+ if ((u > 0) && (v > 0) && (u +
v < 1)) { isInside = 1; } /* is inside a triangle */
/* If collision wasn't found
but the face is a quad
* do another check for
the second half */
@@ -2304,7 +2304,7 @@
u = (dot11 * dot02 -
dot01 * dot12) * invDenom;
v = (dot00 * dot12 -
dot01 * dot02) * invDenom;
- if ((u > 0) && (v > 0)
&& (u + v < 1)) {isInside = 2; } /* is inside the second half of the quad */
+ if ((u > 0) && (v > 0)
&& (u + v < 1)) { isInside = 2; } /* is inside the second half of the quad */
}
@@ -2583,7 +2583,7 @@
int format = (surface->image_fileformat & MOD_DPAINT_IMGFORMAT_OPENEXR)
? R_IMF_IMTYPE_OPENEXR : R_IMF_IMTYPE_PNG;
char output_file[FILE_MAX];
- if (!sData || !sData->type_data) {setError(surface->canvas, "Image save
failed: Invalid surface."); return; }
+ if (!sData || !sData->type_data) { setError(surface->canvas, "Image
save failed: Invalid surface."); return; }
/* if selected format is openexr, but current build doesnt support one
*/
#ifndef WITH_OPENEXR
if (format == R_IMF_IMTYPE_OPENEXR) format = R_IMF_IMTYPE_PNG;
@@ -2597,7 +2597,7 @@
/* Init image buffer */
ibuf = IMB_allocImBuf(surface->image_resolution,
surface->image_resolution, 32, IB_rectfloat);
- if (ibuf == NULL) {setError(surface->canvas, "Image save failed: Not
enough free memory."); return; }
+ if (ibuf == NULL) { setError(surface->canvas, "Image save failed: Not
enough free memory."); return; }
#pragma omp parallel for schedule(static)
for (index = 0; index < sData->total_points; index++) {
@@ -3287,7 +3287,7 @@
int v1
= mface[hit.index].v1, v2 = mface[hit.index].v2, v3 = mface[hit.index].v3, quad
= (hit.no[0] == 1.0f);
float
dot;
- if
(quad) {v2 = mface[hit.index].v3; v3 = mface[hit.index].v4; }
+ if
(quad) { v2 = mface[hit.index].v3; v3 = mface[hit.index].v4; }
normal_tri_v3(hit.no, mvert[v1].co, mvert[v2].co, mvert[v3].co);
dot =
ray_dir[0] * hit.no[0] + ray_dir[1] * hit.no[1] + ray_dir[2] * hit.no[2];
@@ -3580,7 +3580,7 @@
/* for debug purposes check if any NAN particle proceeds
* For some reason they get past activity check, this
should rule most of them out */
- if (isnan(pa->state.co[0]) || isnan(pa->state.co[1]) ||
isnan(pa->state.co[2])) {invalidParticles++; continue; }
+ if (isnan(pa->state.co[0]) || isnan(pa->state.co[1]) ||
isnan(pa->state.co[2])) { invalidParticles++; continue; }
/* make sure particle is close enough to canvas */
if (!boundIntersectPoint(&grid->grid_bounds, pa->state.co,
range)) continue;
@@ -3953,7 +3953,7 @@
int n_index = sData->adj_data->n_index[index] + i;
float dir_dot = dot_v3v3(bNeighs[n_index].dir, force);
- if (dir_dot > closest_d[0] && dir_dot > 0.0f) {closest_d[0] =
dir_dot; closest_id[0] = n_index; }
+ if (dir_dot > closest_d[0] && dir_dot > 0.0f) { closest_d[0] =
dir_dot; closest_id[0] = n_index; }
}
if (closest_d[0] < 0.0f) return;
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2012-06-25
07:24:01 UTC (rev 48252)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2012-06-25
07:24:48 UTC (rev 48253)
@@ -1321,7 +1321,7 @@
}
}
-#define LIBTAG(a) if (a && a->id.lib) {a->id.flag &= ~LIB_INDIRECT;
a->id.flag |= LIB_EXTERN; } (void)0
+#define LIBTAG(a) if (a && a->id.lib) { a->id.flag &= ~LIB_INDIRECT;
a->id.flag |= LIB_EXTERN; } (void)0
static void lib_indirect_test_id(ID *id, Library *lib)
{
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2012-06-25
07:24:01 UTC (rev 48252)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2012-06-25
07:24:48 UTC (rev 48253)
@@ -3752,7 +3752,7 @@
}
#define SET_PARTICLE_TEXTURE(type, pvalue, texfac) \
- if ((event & mtex->mapto) & type) {pvalue = texture_value_blend(def,
pvalue, value, texfac, blend); } (void)0
+ if ((event & mtex->mapto) & type) { pvalue = texture_value_blend(def,
pvalue, value, texfac, blend); } (void)0
#define CLAMP_PARTICLE_TEXTURE_POS(type, pvalue) \
if (event & type) { if (pvalue < 0.0f) pvalue = 1.0f + pvalue;
CLAMP(pvalue, 0.0f, 1.0f); } (void)0
Modified: trunk/blender/source/blender/blenlib/BLI_array.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_array.h 2012-06-25 07:24:01 UTC
(rev 48252)
+++ trunk/blender/source/blender/blenlib/BLI_array.h 2012-06-25 07:24:48 UTC
(rev 48253)
@@ -25,7 +25,10 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/*
+/** \file BLI_array.h
+ * \ingroup bli
+ * \brief A macro array library.
+ *
* this library needs to be changed to not use macros quite so heavily,
* and to be more of a complete array API. The way arrays are
* exposed to client code as normal C arrays is very useful though, imho.
@@ -118,7 +121,7 @@
/* grow an array by a specified number of items */
#define BLI_array_grow_items(arr, num) ( \
((void *)(arr) == NULL && (void *)(_##arr##_static) != NULL) ?
\
- ((arr = (void *)_##arr##_static), (_##arr##_count += num)) :
\
+ ((arr = (void *)_##arr##_static), (_##arr##_count += num)) :
\
_bli_array_grow_items(arr, num)
\
)
@@ -186,4 +189,3 @@
#define BLI_array_fixedstack_free(arr) \
if (_##arr##_is_static) MEM_freeN(arr)
\
-
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2012-06-25
07:24:01 UTC (rev 48252)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2012-06-25
07:24:48 UTC (rev 48253)
@@ -106,7 +106,7 @@
/* ************* XXX **************** */
static void error(const char *UNUSED(arg)) {}
static void waitcursor(int UNUSED(val)) {}
-static int pupmenu(const char *UNUSED(msg)) {return 0;}
+static int pupmenu(const char *UNUSED(msg)) { return 0; }
/* port over here */
static void error_libdata(void) {}
Modified:
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
2012-06-25 07:24:01 UTC (rev 48252)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
2012-06-25 07:24:48 UTC (rev 48253)
@@ -587,14 +587,14 @@
/* only get unselected nabours */
neighbor = find_neighboring_sequence(scene,
seq, SEQ_SIDE_LEFT, isel);
if (neighbor) {
- if (sel) {neighbor->flag |= SELECT;
recurs_sel_seq(neighbor); }
+ if (sel) { neighbor->flag |= SELECT;
recurs_sel_seq(neighbor); }
else neighbor->flag &= ~SELECT;
if (linked == 0) neighbor->tmp =
(Sequence *)1;
change = 1;
}
neighbor = find_neighboring_sequence(scene,
seq, SEQ_SIDE_RIGHT, isel);
if (neighbor) {
- if (sel) {neighbor->flag |= SELECT;
recurs_sel_seq(neighbor); }
+ if (sel) { neighbor->flag |= SELECT;
recurs_sel_seq(neighbor); }
else neighbor->flag &= ~SELECT;
if (linked == 0) neighbor->tmp = (void
*)1;
change = 1;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_mask.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_mask.c 2012-06-25
07:24:01 UTC (rev 48252)
+++ trunk/blender/source/blender/modifiers/intern/MOD_mask.c 2012-06-25
07:24:48 UTC (rev 48253)
@@ -178,7 +178,7 @@
return derivedData;
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
