From 37f59451889d64e588ace4f16f7eebd085d8147a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 25 Jun 2013 10:44:30 +0000 Subject: style cleanup --- source/blender/blenkernel/intern/autoexec.c | 2 +- source/blender/blenkernel/intern/deform.c | 2 +- source/blender/blenkernel/intern/mball.c | 8 +++++--- source/blender/blenkernel/intern/tracking.c | 2 +- source/blender/blenloader/intern/readfile.c | 2 +- source/blender/editors/render/render_internal.c | 7 ++++--- source/blender/editors/render/render_opengl.c | 2 +- source/blender/editors/space_view3d/space_view3d.c | 4 ++++ source/blender/editors/space_view3d/view3d_buttons.c | 4 ++-- source/blender/editors/transform/transform_manipulator.c | 2 +- source/blender/gpu/intern/gpu_codegen.c | 4 ++-- 11 files changed, 23 insertions(+), 16 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/autoexec.c b/source/blender/blenkernel/intern/autoexec.c index c27343bf80a..872780bd50a 100644 --- a/source/blender/blenkernel/intern/autoexec.c +++ b/source/blender/blenkernel/intern/autoexec.c @@ -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, diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index edeef26ed58..b82e89d1af6 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -88,7 +88,7 @@ void defvert_copy_subset(MDeformVert *dvert_dst, const MDeformVert *dvert_src, 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); } diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index d09490db235..8361f0c4f6c 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -151,7 +151,7 @@ typedef struct process { /* parameters, function, storage */ /* 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 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) 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 @@ void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase) } 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); diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 9ae3c5cdfe1..c073c716ec6 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -3889,7 +3889,7 @@ ImBuf *BKE_tracking_stabilize_frame(MovieTracking *tracking, int framenr, ImBuf * 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++) { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 07ed2f18111..673cd3f7b26 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9331,7 +9331,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } 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) { diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 4542f140e67..09138a5523a 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -299,7 +299,7 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str) 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 @@ static void make_renderinfo_string(RenderStats *rs, Scene *scene, char *str) /* 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 @@ static void render_endjob(void *rjv) /* 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 diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index a22f776d9a0..13379425258 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -271,7 +271,7 @@ static void screen_opengl_render_apply(OGLRender *oglrender) 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; diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index b3d58bfa1b1..fef534fa5f2 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -805,7 +805,9 @@ static void view3d_main_area_listener(bScreen *sc, ScrArea *sa, ARegion *ar, wmN 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 @@ static void view3d_main_area_listener(bScreen *sc, ScrArea *sa, ARegion *ar, wmN 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; diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 369051a0ab9..c3686c601d8 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -907,12 +907,12 @@ static void view3d_panel_vgroup(const bContext *C, Panel *pa) 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")); } diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 8972229d618..5059e3bcc40 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1651,7 +1651,7 @@ void BIF_draw_manipulator(const bContext *C) 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); diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index f9e1babcb56..e244c7cf57f 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -567,7 +567,7 @@ static void codegen_call_functions(DynStr *ds, ListBase *nodes, GPUOutput *final "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 @@ static char *code_generate_fragment(ListBase *nodes, GPUOutput *output, const ch 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"); -- cgit v1.2.3