[Bf-blender-cvs] [16ede6584e6] master: Cleanup: format
Campbell Barton
noreply at git.blender.org
Fri Aug 5 05:35:38 CEST 2022
Commit: 16ede6584e6824f596e4816e86c0c2ed2236d646
Author: Campbell Barton
Date: Fri Aug 5 13:34:10 2022 +1000
Branches: master
https://developer.blender.org/rB16ede6584e6824f596e4816e86c0c2ed2236d646
Cleanup: format
===================================================================
M source/blender/blenkernel/intern/collection.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/depsgraph/DEG_depsgraph_build.h
M source/blender/editors/object/object_remesh.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 09085fa8ffb..934c3053a02 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -713,7 +713,8 @@ void BKE_collection_new_name_get(Collection *collection_parent, char *rname)
name = BLI_strdup(DATA_("Collection"));
}
else if (collection_parent->flag & COLLECTION_IS_MASTER) {
- name = BLI_sprintfN(DATA_("Collection %d"), BLI_listbase_count(&collection_parent->children) + 1);
+ name = BLI_sprintfN(DATA_("Collection %d"),
+ BLI_listbase_count(&collection_parent->children) + 1);
}
else {
const int number = BLI_listbase_count(&collection_parent->children) + 1;
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index c2fb11fac97..113fc244086 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -66,8 +66,9 @@
static bool blo_is_builtin_template(const char *app_template)
{
/* For all builtin templates shipped with Blender. */
- return (!app_template ||
- STR_ELEM(app_template, N_("2D_Animation"), N_("Sculpting"), N_("VFX"), N_("Video_Editing")));
+ return (
+ !app_template ||
+ STR_ELEM(app_template, N_("2D_Animation"), N_("Sculpting"), N_("VFX"), N_("Video_Editing")));
}
static void blo_update_defaults_screen(bScreen *screen,
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h
index aae5bb2b432..ac6ab5c7666 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.h
+++ b/source/blender/depsgraph/DEG_depsgraph_build.h
@@ -162,7 +162,7 @@ void DEG_add_generic_id_relation(struct DepsNodeHandle *node_handle,
* have transformation for the modifier, taking into account possible simulation solvers.
*/
void DEG_add_depends_on_transform_relation(struct DepsNodeHandle *node_handle,
- const char *description);
+ const char *description);
/**
* Adds relations from the given component of a given object to the given node
diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc
index d44af45a015..ac4fb40d832 100644
--- a/source/blender/editors/object/object_remesh.cc
+++ b/source/blender/editors/object/object_remesh.cc
@@ -582,7 +582,7 @@ static int voxel_size_edit_invoke(bContext *C, wmOperator *op, const wmEvent *ev
mat4_to_size(scale, active_object->obmat);
invert_v3(scale);
size_to_mat4(scale_mat, scale);
-
+
mul_m4_m4_pre(cd->text_mat, scale_mat);
/* Write the text position into the matrix. */
More information about the Bf-blender-cvs
mailing list