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:
authorCampbell Barton <ideasman42@gmail.com>2020-12-11 06:59:08 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-12-11 07:32:14 +0300
commit8cc951d2aebe27651ba9a2b8a3ee4c59fafdb920 (patch)
treee54b6aa9d5cde2df19a08886df201a519ed66ae6
parentff6d7e907269c3e090d4234df6eb7e812c809050 (diff)
Cleanup: trailing space
-rw-r--r--build_files/cmake/platform/platform_win32.cmake4
-rw-r--r--extern/draco/draco/CMakeLists.txt1
-rw-r--r--release/scripts/modules/bl_i18n_utils/utils.py4
-rw-r--r--release/scripts/modules/bl_i18n_utils/utils_cli.py10
-rw-r--r--release/scripts/startup/bl_ui/properties_view_layer.py4
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py2
-rw-r--r--source/blender/blenkernel/BKE_cryptomatte.h2
-rw-r--r--source/blender/draw/engines/eevee/shaders/cryptomatte_frag.glsl2
-rw-r--r--source/blender/editors/space_graph/graph_view.c2
9 files changed, 15 insertions, 16 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index dd8b286c689..016ae58fde4 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -739,7 +739,7 @@ if(WINDOWS_PYTHON_DEBUG)
string(REPLACE "/" "\\" _group_path "${_source_path}")
source_group("${_group_path}" FILES "${_source}")
endforeach()
-
+
# If the user scripts env var is set, include scripts from there otherwise
# include user scripts in the profile folder.
if(DEFINED ENV{BLENDER_USER_SCRIPTS})
@@ -750,7 +750,7 @@ if(WINDOWS_PYTHON_DEBUG)
# Include the user scripts from the profile folder in the blender_python_user_scripts project.
set(USER_SCRIPTS_ROOT "$ENV{appdata}/blender foundation/blender/${BLENDER_VERSION}/scripts")
endif()
-
+
file(TO_CMAKE_PATH ${USER_SCRIPTS_ROOT} USER_SCRIPTS_ROOT)
FILE(GLOB_RECURSE inFiles "${USER_SCRIPTS_ROOT}/*.*" )
ADD_CUSTOM_TARGET(blender_python_user_scripts SOURCES ${inFiles})
diff --git a/extern/draco/draco/CMakeLists.txt b/extern/draco/draco/CMakeLists.txt
index 6f9ffce6b48..d775b39d3ac 100644
--- a/extern/draco/draco/CMakeLists.txt
+++ b/extern/draco/draco/CMakeLists.txt
@@ -268,4 +268,3 @@ set(INC
)
blender_add_lib(draco "${SRC}" "${INC}" "" "${LIB}")
-
diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py
index 40b76b617b3..fd4488ecd73 100644
--- a/release/scripts/modules/bl_i18n_utils/utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils.py
@@ -185,9 +185,9 @@ def list_po_dir(root_path, settings):
"""
Generator. List given directory (expecting one sub-directory per languages)
and return all files matching languages listed in settings.
-
+
Yield tuples (can_use, uid, num_id, name, isocode, po_path)
-
+
Note that po_path may not actually exists.
"""
isocodes = ((e, os.path.join(root_path, e, e + ".po")) for e in os.listdir(root_path))
diff --git a/release/scripts/modules/bl_i18n_utils/utils_cli.py b/release/scripts/modules/bl_i18n_utils/utils_cli.py
index d38911c122d..76dd8a740c5 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_cli.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_cli.py
@@ -103,22 +103,22 @@ def main():
sub_parsers = parser.add_subparsers()
sub_parser = sub_parsers.add_parser('update_po', help="Update a PO file from a given POT template file")
- sub_parser.add_argument('--template', metavar='template.pot', required=True,
+ sub_parser.add_argument('--template', metavar='template.pot', required=True,
help="The source pot file to use as template for the update.")
sub_parser.add_argument('--dst', metavar='dst.po', required=True, help="The destination po to update.")
- sub_parser.set_defaults(func=update_po)
+ sub_parser.set_defaults(func=update_po)
sub_parser = sub_parsers.add_parser('cleanup_po',
help="Cleanup a PO file (check for and fix some common errors, remove commented messages).")
sub_parser.add_argument('--src', metavar='src.po', required=True, help="The source po file to clean up.")
sub_parser.add_argument('--dst', metavar='dst.po', help="The destination po to write to.")
- sub_parser.set_defaults(func=cleanup_po)
+ sub_parser.set_defaults(func=cleanup_po)
sub_parser = sub_parsers.add_parser('strip_po',
help="Reduce all non-essential data from given PO file (reduce its size).")
sub_parser.add_argument('--src', metavar='src.po', required=True, help="The source po file to strip.")
sub_parser.add_argument('--dst', metavar='dst.po', help="The destination po to write to.")
- sub_parser.set_defaults(func=strip_po)
+ sub_parser.set_defaults(func=strip_po)
sub_parser = sub_parsers.add_parser('rtl_process_po',
help="Pre-process PO files for RTL languages.")
@@ -128,7 +128,7 @@ def main():
sub_parser = sub_parsers.add_parser('language_menu',
help="Generate the text file used by Blender to create its language menu.")
- sub_parser.set_defaults(func=language_menu)
+ sub_parser.set_defaults(func=language_menu)
args = parser.parse_args(sys.argv[1:])
diff --git a/release/scripts/startup/bl_ui/properties_view_layer.py b/release/scripts/startup/bl_ui/properties_view_layer.py
index 27df3b10853..751558a4bed 100644
--- a/release/scripts/startup/bl_ui/properties_view_layer.py
+++ b/release/scripts/startup/bl_ui/properties_view_layer.py
@@ -187,8 +187,8 @@ class ViewLayerCryptomattePanel(ViewLayerButtonsPanel, Panel):
col.prop(view_layer, "use_pass_cryptomatte_material", text="Material")
col.prop(view_layer, "use_pass_cryptomatte_asset", text="Asset")
col = layout.column()
- col.active = any((view_layer.use_pass_cryptomatte_object,
- view_layer.use_pass_cryptomatte_material,
+ col.active = any((view_layer.use_pass_cryptomatte_object,
+ view_layer.use_pass_cryptomatte_material,
view_layer.use_pass_cryptomatte_asset))
col.prop(view_layer, "pass_cryptomatte_depth", text="Levels")
col.prop(view_layer, "use_pass_cryptomatte_accurate", text="Accurate Mode")
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 761e60aef30..eb80a3e010f 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -207,7 +207,7 @@ class USERPREF_PT_interface_display(InterfacePanel, CenterAlignMixIn, Panel):
col.prop(view, "ui_line_width", text="Line Width")
col.prop(view, "show_splash", text="Splash Screen")
col.prop(view, "show_developer_ui")
-
+
col.separator()
col = layout.column(heading="Tooltips", align=True)
diff --git a/source/blender/blenkernel/BKE_cryptomatte.h b/source/blender/blenkernel/BKE_cryptomatte.h
index 9ad4770c754..929266d1b89 100644
--- a/source/blender/blenkernel/BKE_cryptomatte.h
+++ b/source/blender/blenkernel/BKE_cryptomatte.h
@@ -39,4 +39,4 @@ float BKE_cryptomatte_hash_to_float(uint32_t cryptomatte_hash);
#ifdef __cplusplus
}
-#endif \ No newline at end of file
+#endif
diff --git a/source/blender/draw/engines/eevee/shaders/cryptomatte_frag.glsl b/source/blender/draw/engines/eevee/shaders/cryptomatte_frag.glsl
index 1e499dbf991..9426b8e4a7b 100644
--- a/source/blender/draw/engines/eevee/shaders/cryptomatte_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/cryptomatte_frag.glsl
@@ -4,4 +4,4 @@ out vec4 fragColor;
void main()
{
fragColor = cryptohash;
-} \ No newline at end of file
+}
diff --git a/source/blender/editors/space_graph/graph_view.c b/source/blender/editors/space_graph/graph_view.c
index 0b9ba3762a3..cde0dab3503 100644
--- a/source/blender/editors/space_graph/graph_view.c
+++ b/source/blender/editors/space_graph/graph_view.c
@@ -533,4 +533,4 @@ void GRAPH_OT_ghost_curves_clear(wmOperatorType *ot)
/* Flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-} \ No newline at end of file
+}