Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-08-15 14:21:19 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-08-15 14:47:14 +0300
commit8c77fa558a20728ee748824a3fbbabe964aefab5 (patch)
treeaeb31a321e3766e39af2eeb4a3973e018f7e0a0b /source/blender
parent7be7280c5710f7831789cdde140d010722be9068 (diff)
Cleanup: make format
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/mesh_tessellate.cc3
-rw-r--r--source/blender/blenloader/intern/readfile.c3
-rw-r--r--source/blender/blenloader/intern/versioning_defaults.c5
-rw-r--r--source/blender/editors/object/object_remesh.cc2
4 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/mesh_tessellate.cc b/source/blender/blenkernel/intern/mesh_tessellate.cc
index ab0aeb88ebc..de4c60b28db 100644
--- a/source/blender/blenkernel/intern/mesh_tessellate.cc
+++ b/source/blender/blenkernel/intern/mesh_tessellate.cc
@@ -282,7 +282,8 @@ static void mesh_recalc_looptri__multi_threaded(const MLoop *mloop,
{
struct TessellationUserTLS tls_data_dummy = {nullptr};
- struct TessellationUserData data {};
+ struct TessellationUserData data {
+ };
data.mloop = mloop;
data.mpoly = mpoly;
data.mvert = mvert;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6fad67eb217..b880f0513b8 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -359,8 +359,7 @@ static void oldnewmap_insert(OldNewMap *onm, const void *oldaddr, void *newaddr,
oldnewmap_insert_or_replace(onm, entry);
}
-static void oldnewmap_lib_insert(
- FileData *fd, const void *oldaddr, ID *newaddr, int nr)
+static void oldnewmap_lib_insert(FileData *fd, const void *oldaddr, ID *newaddr, int nr)
{
oldnewmap_insert(fd->libmap, oldaddr, newaddr, nr);
}
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/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. */