Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Sat, 1 Apr 2017 01:09:17 +0000 (12:09 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 1 Apr 2017 01:09:17 +0000 (12:09 +1100)
source/blender/alembic/intern/abc_exporter.cc
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/io/io_collada.c
source/blender/editors/transform/transform_snap_object.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c

index 61e7712150f62303c622e22fac7a191d183ff410..564157fbc975e3f1cb3e7bb3c79000f17a442f09 100644 (file)
@@ -418,7 +418,7 @@ void AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupl
        BLI_assert(ob != dupliObParent);
 
        /* check if we have already created a transform writer for this object */
-       if (getXForm(name) != NULL){
+       if (getXForm(name) != NULL) {
                std::cerr << "xform " << name << " already exists\n";
                return;
        }
index fa9acc36a2b5c2439ab8ceed2a84002257621ecc..601a86b97cbaaf327f259f01d598f02336123bd3 100644 (file)
@@ -2126,10 +2126,10 @@ static int gp_count_subdivision_cuts(bGPDstroke *gps)
        int totnewpoints = 0;
        for (i = 0, pt = gps->points; i < gps->totpoints && pt; i++, pt++) {
                if (pt->flag & GP_SPOINT_SELECT) {
-                       if (i + 1 < gps->totpoints){
+                       if (i + 1 < gps->totpoints) {
                                if (gps->points[i + 1].flag & GP_SPOINT_SELECT) {
                                        ++totnewpoints;
-                               };
+                               }
                        }
                }
        }
@@ -2184,7 +2184,7 @@ static int gp_stroke_subdivide_exec(bContext *C, wmOperator *op)
 
                                        /* if next point is selected add a half way point */
                                        if (pt->flag & GP_SPOINT_SELECT) {
-                                               if (i + 1 < oldtotpoints){
+                                               if (i + 1 < oldtotpoints) {
                                                        if (temp_points[i + 1].flag & GP_SPOINT_SELECT) {
                                                                pt_final = &gps->points[i2];
                                                                /* Interpolate all values */
@@ -2196,7 +2196,7 @@ static int gp_stroke_subdivide_exec(bContext *C, wmOperator *op)
                                                                pt_final->time = interpf(pt->time, next->time, 0.5f);
                                                                pt_final->flag |= GP_SPOINT_SELECT;
                                                                ++i2;
-                                                       };
+                                                       }
                                                }
                                        }
                                }
index 7b0921941e7912560b754ca8028e382d087cea4f..9b6547cf8a1b8c80344e373fe37cf37be5482ec1 100644 (file)
@@ -2174,12 +2174,13 @@ static void ui_litem_layout_row(uiLayout *litem)
                        bool min_flag = item->flag & UI_ITEM_MIN;
                        /* ignore min flag for rows with right or center alignment */
                        if (item->type != ITEM_BUTTON &&
-                                       ELEM(((uiLayout *)item)->alignment, UI_LAYOUT_ALIGN_RIGHT, UI_LAYOUT_ALIGN_CENTER) &&
-                                       litem->alignment == UI_LAYOUT_ALIGN_EXPAND && 
-                                       ((uiItem *)litem)->flag & UI_ITEM_MIN) {
+                           ELEM(((uiLayout *)item)->alignment, UI_LAYOUT_ALIGN_RIGHT, UI_LAYOUT_ALIGN_CENTER) &&
+                           litem->alignment == UI_LAYOUT_ALIGN_EXPAND && 
+                           ((uiItem *)litem)->flag & UI_ITEM_MIN)
+                       {
                                min_flag = false;
                        }
-                       
+
                        if ((neww < minw || min_flag) && w != 0) {
                                /* fixed size */
                                item->flag |= UI_ITEM_FIXED;
index 9b12aa6d475c965e742c4c39689ac431c78cb8ce..b8794afbf859021d5cc5886877d978bfc089f085 100644 (file)
@@ -437,7 +437,7 @@ static int wm_collada_import_exec(bContext *C, wmOperator *op)
                auto_connect,
                fix_orientation,
                min_chain_length,
-                       keep_bind_info) )
+               keep_bind_info) )
        {
                return OPERATOR_FINISHED;
        }
index 3c9becc60dcd59174c1c00777a73655d0f10da85..b33528b4149c2cc8ddd02c2dcdfdef00f007e143 100644 (file)
@@ -1122,15 +1122,14 @@ static bool snapDerivedMesh(
                        float dist_px_sq = dist_squared_to_projected_aabb_simple(
                                lpmat, snapdata->win_half, ray_min_dist, snapdata->mval,
                                ray_org_local, ray_normal_local, bb->vec[0], bb->vec[6]);
-                       if (dist_px_sq > SQUARE(*dist_px))
-                       {
+                       if (dist_px_sq > SQUARE(*dist_px)) {
                                return retval;
                        }
                }
                else {
                        /* was BKE_boundbox_ray_hit_check, see: cf6ca226fa58 */
                        if (!isect_ray_aabb_v3_simple(
-                               ray_start_local, ray_normal_local, bb->vec[0], bb->vec[6], NULL, NULL))
+                               ray_start_local, ray_normal_local, bb->vec[0], bb->vec[6], NULL, NULL))
                        {
                                return retval;
                        }
index 6ca742dcfb2283607b914cac8fdb7eb7940f8a8e..028355f9af37ba2eec44607adee57b9c1445ee66 100644 (file)
@@ -809,7 +809,7 @@ int wm_homefile_read(
                if (userdef_template == NULL) {
                        /* we need to have preferences load to overwrite preferences from previous template */
                        userdef_template = BKE_blendfile_userdef_read_from_memory(
-                                       datatoc_startup_blend, datatoc_startup_blend_size, NULL);
+                               datatoc_startup_blend, datatoc_startup_blend_size, NULL);
                }
                if (userdef_template) {
                        BKE_blender_userdef_set_app_template(userdef_template);
index 51f501e04861974a89efa11aeea6206f7a8004d5..aaf77946412cd2ddbcb9f320a5738e7e18678209 100644 (file)
@@ -397,7 +397,7 @@ static void wm_window_set_dpi(wmWindow *win)
        /* Blender's UI drawing assumes DPI 72 as a good default following macOS
         * while Windows and Linux use DPI 96. GHOST assumes a default 96 so we
         * remap the DPI to Blender's convention. */
-       int dpi = auto_dpi * U.ui_scale * (72.0/96.0f);
+       int dpi = auto_dpi * U.ui_scale * (72.0 / 96.0f);
 
        /* Automatically set larger pixel size for high DPI. */
        int pixelsize = MAX2(1, dpi / 54);