[Bf-blender-cvs] [0e65c4839c4] blender2.8: Cleanup: style

Campbell Barton noreply at git.blender.org
Mon Sep 24 00:14:51 CEST 2018


Commit: 0e65c4839c407c4c117a75e9e9376b5b02ed68b5
Author: Campbell Barton
Date:   Mon Sep 24 08:25:51 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB0e65c4839c407c4c117a75e9e9376b5b02ed68b5

Cleanup: style

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/blenkernel/intern/multires_reshape.c
M	source/blender/blenkernel/intern/subdiv_ccg_mask.c
M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/editors/mesh/editmesh_select_similar.c
M	source/blender/editors/transform/transform_snap_object.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 35e0ecea67e..5e03c521af3 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -225,7 +225,7 @@ class VIEW3D_HT_header(Header):
                 icon=or_icon,
             )
 
-        if object_mode in ('GPENCIL_PAINT', 'GPENCIL_SCULPT'):
+        if object_mode in {'GPENCIL_PAINT', 'GPENCIL_SCULPT'}:
             lock = tool_settings.gpencil_sculpt.lockaxis
             gp_lock = \
                 tool_settings.gpencil_sculpt.bl_rna.properties['lockaxis'].enum_items[lock]
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c
index 35dbc7f7b9b..617352840da 100644
--- a/source/blender/blenkernel/intern/multires_reshape.c
+++ b/source/blender/blenkernel/intern/multires_reshape.c
@@ -227,7 +227,7 @@ static void multires_reshape_vertex_copy_to_next(
         const MPoly *coarse_poly,
         const int current_corner,
         const MDisps *current_displacement_grid,
-		const GridPaintMask *current_mask_grid,
+        const GridPaintMask *current_mask_grid,
         const int current_grid_x, const int current_grid_y)
 {
 	const int grid_size = ctx->grid_size;
@@ -474,7 +474,7 @@ static void multires_reshape_propagate_prepare_from_mmd(
 }
 
 static void multires_reshape_propagate_corner_data(
-        MultiresPropagateCornerData* corner,
+        MultiresPropagateCornerData *corner,
         const MDisps *old_displacement_grid,
         const MDisps *new_displacement_grid,
         const GridPaintMask *grid_paint_mask,
@@ -505,7 +505,7 @@ static void multires_reshape_propagate_all_corners_data(
         MultiresPropagateCornerData corners[4],
         const MDisps *old_displacement_grid,
         const MDisps *new_displacement_grid,
-		const GridPaintMask *grid_paint_mask,
+        const GridPaintMask *grid_paint_mask,
         const int grid_size,
         const int grid_skip,
         const int reshape_x, const int reshape_y)
@@ -636,7 +636,8 @@ static void multires_reshape_propagate_grid(
 	}
 }
 
-static void multires_reshape_propagate(MultiresPropagateData *data) {
+static void multires_reshape_propagate(MultiresPropagateData *data)
+{
 	if (data->old_displacement_grids == NULL) {
 		return;
 	}
@@ -660,7 +661,8 @@ static void multires_reshape_propagate(MultiresPropagateData *data) {
 	}
 }
 
-static void multires_reshape_propagate_free(MultiresPropagateData *data) {
+static void multires_reshape_propagate_free(MultiresPropagateData *data)
+{
 	if (data->old_displacement_grids != NULL) {
 		const int num_grids = data->num_grids;
 		MDisps *old_mdisps = data->old_displacement_grids;
diff --git a/source/blender/blenkernel/intern/subdiv_ccg_mask.c b/source/blender/blenkernel/intern/subdiv_ccg_mask.c
index 3805e0b4bdc..f3a63bb0e9e 100644
--- a/source/blender/blenkernel/intern/subdiv_ccg_mask.c
+++ b/source/blender/blenkernel/intern/subdiv_ccg_mask.c
@@ -233,8 +233,8 @@ bool BKE_subdiv_ccg_mask_init_from_paint(
 		return false;
 	}
 	/* Allocate all required memory. */
-	mask_evaluator->user_data =MEM_callocN(sizeof(GridPaintMaskData),
-	                                       "mask from grid data");
+	mask_evaluator->user_data = MEM_callocN(sizeof(GridPaintMaskData),
+	                                        "mask from grid data");
 	displacement_init_data(mask_evaluator, mesh);
 	displacement_init_functions(mask_evaluator);
 	return true;
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 011e2641089..2e261ee2e03 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -831,7 +831,7 @@ void do_versions_after_linking_280(Main *bmain)
 
 							newptr[3][1] = bezt->radius;
 
-							oldptr += 3*4;
+							oldptr += 3 * 4;
 							newptr += 4; /*KEYELEM_ELEM_LEN_BEZTRIPLE*/
 						}
 					}
diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c
index b36d9a07fb4..b589b88a69e 100644
--- a/source/blender/editors/mesh/editmesh_select_similar.c
+++ b/source/blender/editors/mesh/editmesh_select_similar.c
@@ -249,7 +249,8 @@ static void edge_pos_direction_worldspace_get(Object *ob, BMEdge *edge, float *r
 	}
 }
 
-static float edge_length_squared_worldspace_get(Object *ob, BMEdge *edge) {
+static float edge_length_squared_worldspace_get(Object *ob, BMEdge *edge)
+{
 	float v1[3], v2[3];
 	copy_v3_v3(v1, edge->v1->co);
 	copy_v3_v3(v2, edge->v2->co);
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 647c3f86ff2..00d521fc81c 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -727,7 +727,7 @@ static bool raycastObj(
 
 	if (use_occlusion_test) {
 		if (use_obedit && sctx->use_v3d &&
-			!V3D_IS_ZBUF(sctx->v3d_data.v3d))
+		    !V3D_IS_ZBUF(sctx->v3d_data.v3d))
 		{
 			/* Use of occlude geometry in editing mode disabled. */
 			return false;



More information about the Bf-blender-cvs mailing list