blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: make format

This commit is contained in:
Brecht Van Lommel 2022-08-15 13:21:19 +02:00
parent 7be7280c57
commit 8c77fa558a
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
release/scripts/startup/bl_ui/space_outliner.py
View File

@ -330,11 +330,17 @@ class OUTLINER_MT_liboverride(Menu):
def draw(self, _context):
layout = self.layout
layout.operator_menu_enum("outliner.liboverride_operation", "selection_set", text="Create").type = 'OVERRIDE_LIBRARY_CREATE_HIERARCHY'
layout.operator_menu_enum("outliner.liboverride_operation", "selection_set", text="Reset").type = 'OVERRIDE_LIBRARY_RESET'
layout.operator_menu_enum("outliner.liboverride_operation", "selection_set", text="Clear").type = 'OVERRIDE_LIBRARY_CLEAR_SINGLE'
layout.operator_menu_enum("outliner.liboverride_operation", "selection_set",
text="Create").type = 'OVERRIDE_LIBRARY_CREATE_HIERARCHY'
layout.operator_menu_enum(
"outliner.liboverride_operation",
"selection_set",
text="Reset").type = 'OVERRIDE_LIBRARY_RESET'
layout.operator_menu_enum("outliner.liboverride_operation", "selection_set",
text="Clear").type = 'OVERRIDE_LIBRARY_CLEAR_SINGLE'
layout.operator_menu_enum("outliner.liboverride_troubleshoot_operation", "type", text="Troubleshoot Hierarchy").selection_set = 'SELECTED'
layout.operator_menu_enum("outliner.liboverride_troubleshoot_operation", "type",
text="Troubleshoot Hierarchy").selection_set = 'SELECTED'
class OUTLINER_PT_filter(Panel):

3
source/blender/blenkernel/intern/mesh_tessellate.cc
View File

@ -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;

3
source/blender/blenloader/intern/readfile.c
View File

@ -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);
}

5
source/blender/blenloader/intern/versioning_defaults.c
View File

@ -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,

2
source/blender/editors/object/object_remesh.cc
View File

@ -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. */