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

Cleanup: format

This commit is contained in:
Campbell Barton 2023-01-11 13:03:49 +11:00
parent 9f283bee7e
commit 12a26b8fe3
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -2702,10 +2702,9 @@ class VIEW3D_MT_object_context_menu(Menu):
if obj.type == 'GPENCIL':
layout.operator_menu_enum("gpencil.convert", "type", text="Convert To")
if (
obj.type in {'MESH', 'CURVE', 'CURVES', 'SURFACE', 'GPENCIL', 'LATTICE', 'ARMATURE', 'META', 'FONT', 'POINTCLOUD'} or
(obj.type == 'EMPTY' and obj.instance_collection is not None)
):
if (obj.type in {
'MESH', 'CURVE', 'CURVES', 'SURFACE', 'GPENCIL', 'LATTICE', 'ARMATURE', 'META', 'FONT', 'POINTCLOUD',
} or (obj.type == 'EMPTY' and obj.instance_collection is not None)):
layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator_menu_enum("object.origin_set", text="Set Origin", property="type")
layout.operator_context = 'INVOKE_DEFAULT'

3
source/blender/editors/space_node/add_menu_assets.cc
View File

@ -87,7 +87,8 @@ static AssetItemTree build_catalog_tree(const bContext &C, const bNodeTree *node
ED_assetlist_storage_fetch(&all_library_ref, &C);
ED_assetlist_ensure_previews_job(&all_library_ref, &C);
asset_system::AssetLibrary *all_library = ED_assetlist_library_get_once_available(all_library_ref);
asset_system::AssetLibrary *all_library = ED_assetlist_library_get_once_available(
all_library_ref);
if (!all_library) {
return {};
}

2
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
View File

@ -44,8 +44,8 @@
#include "BLI_ghash.h"
#include "BLI_listbase.h"
#include "BLI_math_color.h"
#include "BLI_math_vector_types.hh"
#include "BLI_math_vector.h"
#include "BLI_math_vector_types.hh"
#include "BLI_utildefines.h"
#include "DEG_depsgraph.h"

2
source/blender/io/usd/intern/usd_writer_mesh.cc
View File

@ -9,8 +9,8 @@
#include <pxr/usd/usdShade/materialBindingAPI.h>
#include "BLI_assert.h"
#include "BLI_math_vector_types.hh"
#include "BLI_math_vector.h"
#include "BLI_math_vector_types.hh"
#include "BKE_attribute.h"
#include "BKE_attribute.hh"