diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index 25b83a99273..69b5350d4cc 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -7,7 +7,7 @@ string(TIMESTAMP CURRENT_YEAR "%Y") set(PROJECT_DESCRIPTION "Blender is the free and open source 3D creation suite software.") set(PROJECT_COPYRIGHT "Copyright (C) 2001-${CURRENT_YEAR} Blender Authors") set(PROJECT_CONTACT "foundation@blender.org") -set(PROJECT_VENDOR "Blender Authors") +set(PROJECT_VENDOR "Blender Foundation") set(MAJOR_VERSION ${BLENDER_VERSION_MAJOR}) set(MINOR_VERSION ${BLENDER_VERSION_MINOR}) @@ -84,8 +84,8 @@ if(APPLE) endif() if(WIN32) - set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Authors/Blender ${MAJOR_VERSION}.${MINOR_VERSION}") - set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Authors/Blender ${MAJOR_VERSION}.${MINOR_VERSION}") + set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender ${MAJOR_VERSION}.${MINOR_VERSION}") + set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender ${MAJOR_VERSION}.${MINOR_VERSION}") set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) set(CPACK_NSIS_COMPRESSOR "/SOLID lzma") diff --git a/build_files/utils/make_bpy_wheel.py b/build_files/utils/make_bpy_wheel.py index 7940c8b2ff7..c8facf54079 100755 --- a/build_files/utils/make_bpy_wheel.py +++ b/build_files/utils/make_bpy_wheel.py @@ -231,7 +231,7 @@ def main() -> None: long_description=long_description, long_description_content_type='text/markdown', license="GPL-3.0", - author="Blender Authors", + author="Blender Foundation", author_email="bf-committers@blender.org", url="https://www.blender.org" ) diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index c6ed5ec8b31..becb41fa3a7 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -1957,7 +1957,7 @@ except ModuleNotFoundError: fw(" 'papersize': 'a4paper',\n") fw("}\n\n") - fw("latex_documents = [ ('contents', 'contents.tex', 'Blender Index', 'Blender Authors', 'manual'), ]\n") + fw("latex_documents = [ ('contents', 'contents.tex', 'Blender Index', 'Blender Foundation', 'manual'), ]\n") # Workaround for useless links leading to compile errors # See https://github.com/sphinx-doc/sphinx/issues/3866 diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cc b/intern/ghost/intern/GHOST_SystemPathsWin32.cc index 036b9488d4e..d1c159a2591 100644 --- a/intern/ghost/intern/GHOST_SystemPathsWin32.cc +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cc @@ -31,7 +31,7 @@ const char *GHOST_SystemPathsWin32::getSystemDir(int, const char *versionstr) co if (hResult == S_OK) { conv_utf_16_to_8(knownpath_16, knownpath, MAX_PATH * 3); CoTaskMemFree(knownpath_16); - strcat(knownpath, "\\Blender Authors\\Blender\\"); + strcat(knownpath, "\\Blender Foundation\\Blender\\"); strcat(knownpath, versionstr); return knownpath; } @@ -50,7 +50,7 @@ const char *GHOST_SystemPathsWin32::getUserDir(int, const char *versionstr) cons if (hResult == S_OK) { conv_utf_16_to_8(knownpath_16, knownpath, MAX_PATH * 3); CoTaskMemFree(knownpath_16); - strcat(knownpath, "\\Blender Authors\\Blender\\"); + strcat(knownpath, "\\Blender Foundation\\Blender\\"); strcat(knownpath, versionstr); return knownpath; } diff --git a/source/blender/blenkernel/BKE_appdir.h b/source/blender/blenkernel/BKE_appdir.h index 08c236ba5bb..ce6a49bdf69 100644 --- a/source/blender/blenkernel/BKE_appdir.h +++ b/source/blender/blenkernel/BKE_appdir.h @@ -62,7 +62,7 @@ bool BKE_appdir_folder_documents(char *dir) ATTR_NONNULL(1) ATTR_WARN_UNUSED_RES /** * Get the user's cache directory, i.e. * - Linux: `$HOME/.cache/blender/` - * - Windows: `%USERPROFILE%\AppData\Local\Blender Authors\Blender\` + * - Windows: `%USERPROFILE%\AppData\Local\Blender Foundation\Blender\` * - MacOS: `/Library/Caches/Blender` * * \returns True if the path is valid. It doesn't create or checks format diff --git a/source/blender/blenkernel/intern/appdir.cc b/source/blender/blenkernel/intern/appdir.cc index 6f43b428063..f5149a15d76 100644 --- a/source/blender/blenkernel/intern/appdir.cc +++ b/source/blender/blenkernel/intern/appdir.cc @@ -215,7 +215,7 @@ bool BKE_appdir_folder_caches(char *path, const size_t path_maxncpy) #ifdef WIN32 BLI_path_join( - path, path_maxncpy, caches_root_path, "Blender Authors", "Blender", "Cache", SEP_STR); + path, path_maxncpy, caches_root_path, "Blender Foundation", "Blender", "Cache", SEP_STR); #elif defined(__APPLE__) BLI_path_join(path, path_maxncpy, caches_root_path, "Blender", SEP_STR); #else /* __linux__ */