forked from blender/blender
Sergey Sharybin
03806d0b67
This commit implements described in the #104573. The goal is to fix the confusion of the submodule hashes change, which are not ideal for any of the supported git-module configuration (they are either always visible causing confusion, or silently staged and committed, also causing confusion). This commit replaces submodules with a checkout of addons and addons_contrib, covered by the .gitignore, and locale and developer tools are moved to the main repository. This also changes the paths: - /release/scripts are moved to the /scripts - /source/tools are moved to the /tools - /release/datafiles/locale is moved to /locale This is done to avoid conflicts when using bisect, and also allow buildbot to automatically "recover" wgen building older or newer branches/patches. Running `make update` will initialize the local checkout to the changed repository configuration. Another aspect of the change is that the make update will support Github style of remote organization (origin remote pointing to thy fork, upstream remote pointing to the upstream blender/blender.git). Pull Request #104755
68 lines
1.1 KiB
Plaintext
68 lines
1.1 KiB
Plaintext
# generic files to ignore
|
|
.*
|
|
|
|
# python temp paths
|
|
__pycache__/
|
|
*.py[cod]
|
|
|
|
# editors
|
|
*~
|
|
*.swp
|
|
*.swo
|
|
*#
|
|
|
|
# Indexes for emacs, vi & others
|
|
TAGS
|
|
tags
|
|
|
|
# QtCreator
|
|
CMakeLists.txt.user
|
|
|
|
# ms-windows
|
|
Thumbs.db
|
|
ehthumbs.db
|
|
Desktop.ini
|
|
|
|
# commonly used paths in blender
|
|
/blender.bin
|
|
/BUILD_NOTES.txt
|
|
|
|
# local patches
|
|
/*.patch
|
|
/*.diff
|
|
|
|
# in-source doc-gen
|
|
/doc/doxygen/html/
|
|
/doc/python_api/sphinx-in-tmp/
|
|
/doc/python_api/sphinx-in/
|
|
/doc/python_api/sphinx-out/
|
|
/doc/python_api/rst/bmesh.ops.rst
|
|
|
|
# in-source lib downloads
|
|
/build_files/build_environment/downloads/
|
|
|
|
# in-source buildbot signing configuration
|
|
/build_files/buildbot/codesign/config_server.py
|
|
|
|
# smoke simulation noise tile (generated)
|
|
waveletNoiseTile.bin
|
|
|
|
# testing environment
|
|
/Testing/
|
|
|
|
# Translations.
|
|
/locale/user-config.py
|
|
|
|
# External repositories.
|
|
/scripts/addons/
|
|
/scripts/addons_contrib/
|
|
|
|
# Ignore old submodules directories.
|
|
# Eventually need to get rid of those, but for the first time of transition
|
|
# avoid indidents when the folders exists after bisect and developers staging
|
|
# them by accident.
|
|
/release/scripts/addons/
|
|
/release/datafiles/locale/
|
|
/release/scripts/addons_contrib/
|
|
/source/tools/
|