Revision: 57732
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57732
Author: campbellbarton
Date: 2013-06-25 10:44:30 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/autoexec.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
Modified: trunk/blender/source/blender/blenkernel/intern/autoexec.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/autoexec.c 2013-06-25
10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/blenkernel/intern/autoexec.c 2013-06-25
10:44:30 UTC (rev 57732)
@@ -20,7 +20,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/blenkernel/intern/armature.c
+/** \file blender/blenkernel/intern/autoexec.c
* \ingroup bke
*
* Currently just checks if a blend file can be trusted to autoexec,
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2013-06-25
10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2013-06-25
10:44:30 UTC (rev 57732)
@@ -88,7 +88,7 @@
const bool *vgroup_subset, const int vgroup_tot)
{
int defgroup;
- for (defgroup=0; defgroup < vgroup_tot; defgroup++) {
+ for (defgroup = 0; defgroup < vgroup_tot; defgroup++) {
if (vgroup_subset[defgroup]) {
defvert_copy_index(dvert_dst, dvert_src, defgroup);
}
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2013-06-25
10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2013-06-25
10:44:30 UTC (rev 57732)
@@ -151,7 +151,7 @@
/* what happens here? floats, I think. */
/* float (*function)(void); */ /* implicit surface function */
- float (*function)(struct process*, float, float, float);
+ float (*function)(struct process *, float, float, float);
float size, delta; /* cube size, normal delta */
int bounds; /* cube range within lattice */
CUBES *cubes; /* active cubes */
@@ -2283,7 +2283,7 @@
if (process.totelem == 0) return;
if ((G.is_rendering == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return;
- if ((G.moving & (G_TRANSFORM_OBJ|G_TRANSFORM_EDIT)) && mb->flag ==
MB_UPDATE_FAST) return;
+ if ((G.moving & (G_TRANSFORM_OBJ | G_TRANSFORM_EDIT)) && mb->flag ==
MB_UPDATE_FAST) return;
process.thresh = mb->thresh;
@@ -2325,7 +2325,9 @@
}
else {
width = mb->wiresize;
- if ((G.moving & (G_TRANSFORM_OBJ|G_TRANSFORM_EDIT)) && mb->flag
== MB_UPDATE_HALFRES) width *= 2;
+ if ((G.moving & (G_TRANSFORM_OBJ | G_TRANSFORM_EDIT)) &&
mb->flag == MB_UPDATE_HALFRES) {
+ width *= 2;
+ }
}
/* nr_cubes is just for safety, minimum is totsize */
nr_cubes = (int)(0.5f + totsize / width);
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-06-25
10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2013-06-25
10:44:30 UTC (rev 57732)
@@ -3889,7 +3889,7 @@
* But need to keep an eye on this if the function will be
* used in other cases.
*/
- #pragma omp parallel for if(tmpibuf->y > 128)
+ #pragma omp parallel for if (tmpibuf->y > 128)
for (j = 0; j < tmpibuf->y; j++) {
int i;
for (i = 0; i < tmpibuf->x; i++) {
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-06-25
10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-06-25
10:44:30 UTC (rev 57732)
@@ -9331,7 +9331,7 @@
}
if (main->versionfile < 267) {
- //if(!DNA_struct_elem_find(fd->filesdna, "Brush", "int",
"stencil_pos")) {
+ //if (!DNA_struct_elem_find(fd->filesdna, "Brush", "int",
"stencil_pos")) {
Brush *brush;
for (brush = main->brush.first; brush; brush = brush->id.next) {
Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c
2013-06-25 10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/editors/render/render_internal.c
2013-06-25 10:44:30 UTC (rev 57732)
@@ -299,7 +299,7 @@
megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
/* local view */
- if(rs->localview)
+ if (rs->localview)
spos += sprintf(spos, "%s | ", IFACE_("Local View"));
/* frame number */
@@ -323,8 +323,9 @@
/* statistics */
if (rs->statstr) {
- if(rs->statstr[0])
+ if (rs->statstr[0]) {
spos += sprintf(spos, "| %s ", rs->statstr);
+ }
}
else {
if (rs->totvert || rs->totface || rs->tothalo || rs->totstrand
|| rs->totlamp)
@@ -468,7 +469,7 @@
/* XXX render stability hack */
G.is_rendering = FALSE;
- WM_main_add_notifier(NC_SCENE|ND_RENDER_RESULT, NULL);
+ WM_main_add_notifier(NC_SCENE | ND_RENDER_RESULT, NULL);
/* Partial render result will always update display buffer
* for first render layer only. This is nice because you'll
Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c 2013-06-25
10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/editors/render/render_opengl.c 2013-06-25
10:44:30 UTC (rev 57732)
@@ -271,7 +271,7 @@
if (rect) {
int profile_to;
- if(BKE_scene_check_color_management_enabled(scene))
+ if (BKE_scene_check_color_management_enabled(scene))
profile_to = IB_PROFILE_LINEAR_RGB;
else
profile_to = IB_PROFILE_SRGB;
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c
2013-06-25 10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c
2013-06-25 10:44:30 UTC (rev 57732)
@@ -805,7 +805,9 @@
case ND_NODES:
if ((v3d->drawtype == OB_MATERIAL) ||
(v3d->drawtype == OB_TEXTURE &&
scene->gm.matmode == GAME_MAT_GLSL))
+ {
ED_region_tag_redraw(ar);
+ }
break;
case ND_SHADING_DRAW:
case ND_SHADING_LINKS:
@@ -832,7 +834,9 @@
case ND_LIGHTING_DRAW:
if ((v3d->drawtype == OB_MATERIAL) ||
(v3d->drawtype == OB_TEXTURE &&
(scene->gm.matmode == GAME_MAT_GLSL)))
+ {
ED_region_tag_redraw(ar);
+ }
break;
}
break;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
2013-06-25 10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
2013-06-25 10:44:30 UTC (rev 57732)
@@ -907,12 +907,12 @@
ot =
WM_operatortype_find("OBJECT_OT_vertex_weight_normalize_active", 1);
but = uiDefButO_ptr(block, BUT, ot, WM_OP_EXEC_DEFAULT,
"Normalize",
- 0, yco,UI_UNIT_X * 5, UI_UNIT_Y,
+ 0, yco, UI_UNIT_X * 5, UI_UNIT_Y,
TIP_("Normalize active vertex weights"));
ot = WM_operatortype_find("OBJECT_OT_vertex_weight_copy", 1);
but = uiDefButO_ptr(block, BUT, ot, WM_OP_EXEC_DEFAULT, "Copy",
- UI_UNIT_X * 5, yco,UI_UNIT_X * 5, UI_UNIT_Y,
+ UI_UNIT_X * 5, yco, UI_UNIT_X * 5,
UI_UNIT_Y,
TIP_("Copy active vertex to other selected
verts"));
}
Modified: trunk/blender/source/blender/editors/transform/transform_manipulator.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_manipulator.c
2013-06-25 10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/editors/transform/transform_manipulator.c
2013-06-25 10:44:30 UTC (rev 57732)
@@ -1651,7 +1651,7 @@
if (v3d->twtype & V3D_MANIP_ROTATE) {
if (G.debug_value == 3) {
- if (G.moving &
(G_TRANSFORM_OBJ|G_TRANSFORM_EDIT))
+ if (G.moving & (G_TRANSFORM_OBJ |
G_TRANSFORM_EDIT))
draw_manipulator_rotate_cyl(v3d, rv3d,
1, drawflags, v3d->twtype, MAN_MOVECOL);
else
draw_manipulator_rotate_cyl(v3d, rv3d,
0, drawflags, v3d->twtype, MAN_RGB);
Modified: trunk/blender/source/blender/gpu/intern/gpu_codegen.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_codegen.c 2013-06-25
10:40:15 UTC (rev 57731)
+++ trunk/blender/source/blender/gpu/intern/gpu_codegen.c 2013-06-25
10:44:30 UTC (rev 57732)
@@ -567,7 +567,7 @@
"tmp", input->link->output->id);
}
else if (input->source == GPU_SOURCE_BUILTIN) {
- if(input->builtin == GPU_VIEW_NORMAL)
+ if (input->builtin == GPU_VIEW_NORMAL)
BLI_dynstr_append(ds, "facingnormal");
else
BLI_dynstr_append(ds,
GPU_builtin_name(input->builtin));
@@ -615,7 +615,7 @@
BLI_dynstr_append(ds, "void main(void)\n");
BLI_dynstr_append(ds, "{\n");
- if(builtins & GPU_VIEW_NORMAL)
+ if (builtins & GPU_VIEW_NORMAL)
BLI_dynstr_append(ds, "\tvec3 facingnormal = (gl_FrontFacing)?
varnormal: -varnormal;\n");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
