1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup: trailing space

Browse Source
This commit is contained in:
Campbell Barton 2020-12-11 14:59:08 +11:00
parent ff6d7e9072
commit 8cc951d2ae
9 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/cmake/platform/platform_win32.cmake
View File

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

1
extern/draco/draco/CMakeLists.txt vendored
View File

@ -268,4 +268,3 @@ set(INC
)
blender_add_lib(draco "${SRC}" "${INC}" "" "${LIB}")

4
release/scripts/modules/bl_i18n_utils/utils.py
View File

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

10
release/scripts/modules/bl_i18n_utils/utils_cli.py
View File

@ -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:])

4
release/scripts/startup/bl_ui/properties_view_layer.py
View File

@ -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")

2
release/scripts/startup/bl_ui/space_userpref.py
View File

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

2
source/blender/blenkernel/BKE_cryptomatte.h
View File

@ -39,4 +39,4 @@ float BKE_cryptomatte_hash_to_float(uint32_t cryptomatte_hash);
#ifdef __cplusplus
}
#endif
#endif

2
source/blender/draw/engines/eevee/shaders/cryptomatte_frag.glsl
View File

@ -4,4 +4,4 @@ out vec4 fragColor;
void main()
{
fragColor = cryptohash;
}
}

2
source/blender/editors/space_graph/graph_view.c
View File

@ -533,4 +533,4 @@ void GRAPH_OT_ghost_curves_clear(wmOperatorType *ot)
/* Flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
}