style cleanup: also correct incorrect doxy heading
authorCampbell Barton <ideasman42@gmail.com>
Wed, 26 Sep 2012 20:26:31 +0000 (20:26 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 26 Sep 2012 20:26:31 +0000 (20:26 +0000)
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/bmesh/operators/bmo_connect.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/space_sequencer/sequencer_view.c
source/blender/editors/space_sequencer/space_sequencer.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesrna/intern/rna_color.c

index 6a3dae9..5dae203 100644 (file)
@@ -639,7 +639,7 @@ static void fcurves_path_rename_fix(ID *owner_id, const char *prefix, const char
                        if (fcu->rna_path != old_path) {
                                bActionGroup *agrp = fcu->grp;
                                
-                               if ((agrp) && strcmp(oldName, agrp->name)==0) {
+                               if ((agrp) && strcmp(oldName, agrp->name) == 0) {
                                        BLI_strncpy(agrp->name, newName, sizeof(agrp->name));
                                }
                        }
index 8b287eb..3d3afa7 100644 (file)
@@ -2607,8 +2607,7 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
 
        /* invalidate color managed buffers if render result changed */
        BLI_lock_thread(LOCK_COLORMANAGE);
-       if (ibuf->x != rres.rectx || ibuf->y != rres.recty || ibuf->rect_float != rectf)
-       {
+       if (ibuf->x != rres.rectx || ibuf->y != rres.recty || ibuf->rect_float != rectf) {
                ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
        }
 
index b0a2745..ff1fdeb 100644 (file)
@@ -914,8 +914,7 @@ void BKE_ffmpeg_filepath_get(char *string, RenderData *rd)
        }
 
        while (*fe) {
-               if (BLI_strcasecmp(string + strlen(string) - strlen(*fe), *fe) == 0)
-               {
+               if (BLI_strcasecmp(string + strlen(string) - strlen(*fe), *fe) == 0) {
                        break;
                }
                fe++;
index 1987294..bb2e49d 100644 (file)
@@ -380,8 +380,9 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op)
 
                                /* compute summed length between vertices in forward direction */
                                len = 0.0f;
-                               for (j = 0; j < lenv2; j++)
-                                       len += len_v3v3(vv1[clamp_index(i+j, lenv1)]->co, vv2[j]->co);
+                               for (j = 0; j < lenv2; j++) {
+                                       len += len_v3v3(vv1[clamp_index(i + j, lenv1)]->co, vv2[j]->co);
+                               }
 
                                if (len < min) {
                                        min = len;
@@ -390,8 +391,9 @@ void bmo_bridge_loops_exec(BMesh *bm, BMOperator *op)
 
                                /* compute summed length between vertices in backward direction */
                                len = 0.0f;
-                               for (j = 0; j < lenv2; j++)
-                                       len += len_v3v3(vv1[clamp_index(i-j, lenv1)]->co, vv2[j]->co);
+                               for (j = 0; j < lenv2; j++) {
+                                       len += len_v3v3(vv1[clamp_index(i - j, lenv1)]->co, vv2[j]->co);
+                               }
 
                                if (len < min) {
                                        min = len;
index 593744f..0100663 100644 (file)
@@ -852,7 +852,7 @@ static void ui_add_smart_controller(bContext *C, uiBut *from, uiBut *to)
        RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
        
        WM_operator_properties_create(&props_ptr, "LOGIC_OT_controller_add");
-       RNA_string_set(&props_ptr, "object", ob->id.name+2);
+       RNA_string_set(&props_ptr, "object", ob->id.name + 2);
 
        /* (3) add a new controller */
        if (WM_operator_name_call(C, "LOGIC_OT_controller_add", WM_OP_EXEC_DEFAULT, &props_ptr) & OPERATOR_FINISHED) {
index 1dcbf57..5bee292 100644 (file)
@@ -566,7 +566,9 @@ static int find_connected_linehit(KnifeTool_OpData *kcd, int testi, BMFace *f, i
                if (testi >= 0 && testi < kcd->totlinehit) {
                        if (knife_find_common_face(&kcd->linehits[testi].kfe->faces,
                                                   &kcd->linehits[i].kfe->faces))
+                       {
                                return i;
+                       }
                }
                else if (f) {
                        if (find_ref(&kcd->linehits[i].kfe->faces, f))
index 3c34891..92b1739 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 
-/** \file blender/editors/space_sequencer/sequencer_modifier.c
+/** \file blender/editors/space_sequencer/sequencer_view.c
  *  \ingroup spseq
  */
 
index 8ac50a5..21c70a5 100644 (file)
@@ -196,7 +196,7 @@ static SpaceLink *sequencer_new(const bContext *C)
 /* not spacelink itself */
 static void sequencer_free(SpaceLink *sl)
 {      
-       SpaceSeq *sseq= (SpaceSeq *) sl;
+       SpaceSeq *sseq = (SpaceSeq *) sl;
        SequencerScopes *scopes = &sseq->scopes;
 
 // XXX if (sseq->gpd) BKE_gpencil_free(sseq->gpd);
index c0ea417..2da9009 100644 (file)
@@ -2860,8 +2860,8 @@ static int view3d_main_area_draw_engine(const bContext *C, ARegion *ar, int draw
 
                engine = RE_engine_create(type);
 
-               engine->tile_x = ceil(ar->winx/(float)scene->r.xparts);
-               engine->tile_y = ceil(ar->winy/(float)scene->r.yparts);
+               engine->tile_x = ceil(ar->winx / (float)scene->r.xparts);
+               engine->tile_y = ceil(ar->winy / (float)scene->r.yparts);
 
                type->view_update(engine, C);
 
index d4f21a8..7fb4a1d 100644 (file)
@@ -866,7 +866,7 @@ static void rna_def_colormanage(BlenderRNA *brna)
        srna = RNA_def_struct(brna, "ColorManagedDisplaySettings", NULL);
        RNA_def_struct_ui_text(srna, "ColorManagedDisplaySettings", "Color management specific to display device");
 
-       prop= RNA_def_property(srna, "display_device", PROP_ENUM, PROP_NONE);
+       prop = RNA_def_property(srna, "display_device", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_items(prop, display_device_items);
        RNA_def_property_enum_funcs(prop, "rna_ColorManagedDisplaySettings_display_device_get",
                                          "rna_ColorManagedDisplaySettings_display_device_set",
@@ -878,7 +878,7 @@ static void rna_def_colormanage(BlenderRNA *brna)
        srna = RNA_def_struct(brna, "ColorManagedViewSettings", NULL);
        RNA_def_struct_ui_text(srna, "ColorManagedViewSettings", "Color management settings used for displaying images on the display");
 
-       prop= RNA_def_property(srna, "view_transform", PROP_ENUM, PROP_NONE);
+       prop = RNA_def_property(srna, "view_transform", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_items(prop, view_transform_items);
        RNA_def_property_enum_funcs(prop, "rna_ColorManagedViewSettings_view_transform_get",
                                          "rna_ColorManagedViewSettings_view_transform_set",
@@ -915,7 +915,7 @@ static void rna_def_colormanage(BlenderRNA *brna)
        srna = RNA_def_struct(brna, "ColorManagedColorspaceSettings", NULL);
        RNA_def_struct_ui_text(srna, "ColorManagedColorspaceSettings", "Input color space settings");
 
-       prop= RNA_def_property(srna, "name", PROP_ENUM, PROP_NONE);
+       prop = RNA_def_property(srna, "name", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_items(prop, color_space_items);
        RNA_def_property_enum_funcs(prop, "rna_ColorManagedColorspaceSettings_colorspace_get",
                                          "rna_ColorManagedColorspaceSettings_colorspace_set",