From 32c5ea62629a2af7a65fe33477d830bb45f7fafb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 2 Dec 2023 14:56:12 +1100 Subject: [PATCH] Cleanup: format --- intern/utfconv/CMakeLists.txt | 2 +- scripts/presets/keyconfig/keymap_data/blender_default.py | 2 +- scripts/startup/bl_ui/properties_grease_pencil_common.py | 4 +++- scripts/startup/bl_ui/space_view3d.py | 1 + source/blender/blenloader/intern/versioning_260.cc | 2 +- source/blender/blenloader/intern/versioning_legacy.cc | 2 +- .../blender/editors/grease_pencil/intern/grease_pencil_ops.cc | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/intern/utfconv/CMakeLists.txt b/intern/utfconv/CMakeLists.txt index 17b9e96751d..aadbeb2811c 100644 --- a/intern/utfconv/CMakeLists.txt +++ b/intern/utfconv/CMakeLists.txt @@ -19,7 +19,7 @@ set(SRC set(LIB ) -# This library is currently windows only, for the other platforms an empty target is created this +# This library is currently windows only, for the other platforms an empty target is created this # way we don't have to clutter if(WIN32) ... endif() all over the place to use this library. if(WIN32) list(APPEND SRC diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index 74faba692aa..f07b60c36d9 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -4632,7 +4632,7 @@ def km_grease_pencil_edit(params): ("grease_pencil.cyclical_set", {"type": 'F', "value": 'PRESS'}, {"properties": [("type", "CLOSE")]}), ("grease_pencil.cyclical_set", {"type": 'C', "value": 'PRESS', "alt": True}, {"properties": [("type", "TOGGLE")]}), - + ("grease_pencil.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None), # Active layer diff --git a/scripts/startup/bl_ui/properties_grease_pencil_common.py b/scripts/startup/bl_ui/properties_grease_pencil_common.py index 7b9d2821600..702ba87e870 100644 --- a/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -273,6 +273,7 @@ class GPENCIL_MT_layer_active(Menu): layout.operator("gpencil.layer_active", text=gpl.info, icon=icon).layer = i i -= 1 + class GREASE_PENCIL_MT_layer_active(Menu): bl_label = "Change Active Layer" @@ -288,7 +289,7 @@ class GREASE_PENCIL_MT_layer_active(Menu): layout.separator() - for i in range(len(obd.layers) - 1, -1, -1): + for i in range(len(obd.layers) - 1, -1, -1): layer = obd.layers[i] if layer == obd.layers.active: icon = 'GREASEPENCIL' @@ -296,6 +297,7 @@ class GREASE_PENCIL_MT_layer_active(Menu): icon = 'NONE' layout.operator("grease_pencil.layer_active", text=layer.name, icon=icon).layer = i + class GPENCIL_MT_material_active(Menu): bl_label = "Change Active Material" diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index aa0c7ee7731..88e71f994ef 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -5808,6 +5808,7 @@ class VIEW3D_MT_edit_gpencil_showhide(Menu): layout.operator("gpencil.hide", text="Hide Active Layer").unselected = False layout.operator("gpencil.hide", text="Hide Inactive Layers").unselected = True + class VIEW3D_MT_edit_greasepencil_showhide(Menu): bl_label = "Show/Hide" diff --git a/source/blender/blenloader/intern/versioning_260.cc b/source/blender/blenloader/intern/versioning_260.cc index 28001e3b00b..d7306e8ccf0 100644 --- a/source/blender/blenloader/intern/versioning_260.cc +++ b/source/blender/blenloader/intern/versioning_260.cc @@ -53,7 +53,7 @@ #include "BKE_anim_visualization.h" #include "BKE_image.h" -#include "BKE_main.hh" /* for Main */ +#include "BKE_main.hh" /* for Main */ #include "BKE_mesh.hh" /* for ME_ defines (patching) */ #include "BKE_mesh_legacy_convert.hh" #include "BKE_modifier.hh" diff --git a/source/blender/blenloader/intern/versioning_legacy.cc b/source/blender/blenloader/intern/versioning_legacy.cc index 26e450f7648..a6f516383fe 100644 --- a/source/blender/blenloader/intern/versioning_legacy.cc +++ b/source/blender/blenloader/intern/versioning_legacy.cc @@ -58,7 +58,7 @@ #include "BKE_deform.h" #include "BKE_fcurve.h" #include "BKE_lattice.hh" -#include "BKE_main.hh" /* for Main */ +#include "BKE_main.hh" /* for Main */ #include "BKE_mesh.hh" /* for ME_ defines (patching) */ #include "BKE_mesh_legacy_convert.hh" #include "BKE_modifier.hh" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc index 6d49bf3332f..4b006748513 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc @@ -38,4 +38,4 @@ void ED_operatormacros_grease_pencil() otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_boolean_set(otmacro->ptr, "use_proportional_edit", false); RNA_boolean_set(otmacro->ptr, "mirror", false); -} \ No newline at end of file +}