[Bf-blender-cvs] [d3a8d25fb3d] master: Cleanup: clang-format
Campbell Barton
noreply at git.blender.org
Thu Jul 11 01:47:10 CEST 2019
Commit: d3a8d25fb3d8750b09d6b75b8b55f92e05c1297e
Author: Campbell Barton
Date: Thu Jul 11 09:14:31 2019 +1000
Branches: master
https://developer.blender.org/rBd3a8d25fb3d8750b09d6b75b8b55f92e05c1297e
Cleanup: clang-format
===================================================================
M source/blender/blenkernel/intern/armature.c
M source/blender/makesrna/intern/rna_mesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 6d855df8af7..65de951b190 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1372,7 +1372,8 @@ static void armature_vert_task(void *__restrict userdata,
BLI_assert(i < data->mesh->totvert);
if (data->mesh->dvert != NULL) {
dvert = data->mesh->dvert + i;
- } else {
+ }
+ else {
dvert = NULL;
}
}
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index f8b35d08ef0..03173bcb3da 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -3095,8 +3095,7 @@ static void rna_def_mesh(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_paint_mask_vertex", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_PAINT_VERT_SEL);
- RNA_def_property_ui_text(
- prop, "Vertex Selection", "Vertex selection masking for painting");
+ RNA_def_property_ui_text(prop, "Vertex Selection", "Vertex selection masking for painting");
RNA_def_property_ui_icon(prop, ICON_VERTEXSEL, 0);
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_Mesh_update_vertmask");
More information about the Bf-blender-cvs
mailing list