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

Campbell Barton noreply at git.blender.org
Thu Sep 6 02:39:37 CEST 2018


Commit: fa6ed6259c0d2420f9af5217551f67018b59ea74
Author: Campbell Barton
Date:   Thu Sep 6 10:45:29 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBfa6ed6259c0d2420f9af5217551f67018b59ea74

Cleanup: style

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

M	source/blender/draw/modes/edit_mesh_mode.c
M	source/blender/editors/uvedit/uvedit_ops.c
M	source/blender/makesrna/intern/rna_scene.c
M	source/blender/python/gpu/gpu_py_select.h

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

diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c
index 2a70d426272..30049bd701a 100644
--- a/source/blender/draw/modes/edit_mesh_mode.c
+++ b/source/blender/draw/modes/edit_mesh_mode.c
@@ -577,8 +577,8 @@ static void EDIT_MESH_cache_populate(void *vedata, Object *ob)
 			bool show_face_dots = ((Mesh *)draw_ctx->object_edit->data)->drawflag & ME_DRAW_FACE_DOT;
 
 			if (stl->g_data->do_faces == false &&
-				stl->g_data->do_edges == false &&
-				(tsettings->selectmode & SCE_SELECT_FACE))
+			    stl->g_data->do_edges == false &&
+			    (tsettings->selectmode & SCE_SELECT_FACE))
 			{
 				/* Force display of face centers in this case because that's
 				 * the only way to see if a face is selected. */
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index b6b5e75b104..042d77b479b 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -1679,9 +1679,9 @@ static void uv_weld_align(bContext *C, int tool)
 
 					/* we know the returns from these must be valid */
 					const float *uv_start = uv_sel_co_from_eve(
-							scene, obedit, ima, em, eve_line[0]);
+					        scene, obedit, ima, em, eve_line[0]);
 					const float *uv_end   = uv_sel_co_from_eve(
-							scene, obedit, ima, em, eve_line[BLI_array_len(eve_line) - 1]);
+					        scene, obedit, ima, em, eve_line[BLI_array_len(eve_line) - 1]);
 					/* For t & u modes */
 					float a = 0.0f;
 					int tool_local = tool;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 7f2eeba9850..3a8f097d808 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2432,7 +2432,7 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 		"When creating new strokes, the weight data is added according to the current vertex group and weight, "
 		"if no vertex group selected, weight is not added");
 	RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL);
-	
+
 	prop = RNA_def_property(srna, "gpencil_sculpt", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "gp_sculpt");
 	RNA_def_property_struct_type(prop, "GPencilSculptSettings");
diff --git a/source/blender/python/gpu/gpu_py_select.h b/source/blender/python/gpu/gpu_py_select.h
index af39f8c070e..11daf2ade64 100644
--- a/source/blender/python/gpu/gpu_py_select.h
+++ b/source/blender/python/gpu/gpu_py_select.h
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/gpu/gpu_py_api.h
+/** \file blender/python/gpu/gpu_py_select.h
  *  \ingroup bpygpu
  */



More information about the Bf-blender-cvs mailing list