diff options
| -rw-r--r-- | GNUmakefile | 6 | ||||
| -rwxr-xr-x | build_files/cmake/example_scripts/cmake_linux_install.sh | 3 | ||||
| -rw-r--r-- | doc/doxygen/doxygen.main.h | 6 | ||||
| -rw-r--r-- | doc/python_api/examples/bpy.app.translations.py | 6 | ||||
| -rw-r--r-- | release/scripts/startup/bl_operators/uvcalc_follow_active.py | 2 | ||||
| -rw-r--r-- | release/text/readme.html | 6 | ||||
| -rw-r--r-- | source/blender/python/generic/py_capi_utils.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
8 files changed, 16 insertions, 17 deletions
diff --git a/GNUmakefile b/GNUmakefile index 277ee176ce6..ad2c265f3a9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -216,12 +216,12 @@ help: .FORCE @echo " which are tagged to use the stricter formatting" @echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed" @echo " * test_style_c - checks C/C++ conforms with blenders style guide:" - @echo " http://wiki.blender.org/index.php/Dev:Doc/CodeStyle" + @echo " https://wiki.blender.org/wiki/Source/Code_Style" @echo " * test_style_c_qtc - same as test_style but outputs QtCreator tasks format" @echo " * test_style_osl - checks OpenShadingLanguage conforms with blenders style guide:" - @echo " http://wiki.blender.org/index.php/Dev:Doc/CodeStyle" + @echo " https://wiki.blender.org/wiki/Source/Code_Style" @echo " * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide:" - @echo " http://wiki.blender.org/index.php/Dev:Doc/CodeStyle" + @echo " https://wiki.blender.org/wiki/Source/Code_Style" @echo "" @echo "Static Source Code Checking (not associated with building blender)" @echo " * check_cppcheck - run blender source through cppcheck (C & C++)" diff --git a/build_files/cmake/example_scripts/cmake_linux_install.sh b/build_files/cmake/example_scripts/cmake_linux_install.sh index 34bbe104b3b..5599863ff81 100755 --- a/build_files/cmake/example_scripts/cmake_linux_install.sh +++ b/build_files/cmake/example_scripts/cmake_linux_install.sh @@ -4,7 +4,7 @@ # assumes you have dependencies installed already # See this page for more info: -# http://wiki.blender.org/index.php/Dev:Doc/Building_Blender/Linux/Generic_Distro/CMake +# https://wiki.blender.org/wiki/Building_Blender/Linux/Generic_Distro/CMake # grab blender mkdir ~/blender-git @@ -38,4 +38,3 @@ echo " Update Blender: git pull --rebase; git submodule foreach git pull --reb echo " Reconfigure Blender: cd ~/blender-git/build-cmake ; cmake ." echo " Build Blender: cd ~/blender-git/build-cmake ; make" echo "" - diff --git a/doc/doxygen/doxygen.main.h b/doc/doxygen/doxygen.main.h index d2825761b2a..0d7b5e38397 100644 --- a/doc/doxygen/doxygen.main.h +++ b/doc/doxygen/doxygen.main.h @@ -7,11 +7,11 @@ * These pages document the source code of blender. * * \subsection implinks Important Links - * - <a href="http://developer.blender.org">developer.blender.org</a> with bug tracker. - * - <a href="http://wiki.blender.org/index.php/Dev:Contents">Development documents</a> on our wiki. + * - <a href="https://developer.blender.org">developer.blender.org</a> with bug tracker. + * - <a href="https://wiki.blender.org">Development documents</a> on our wiki. * * \subsection blother Other - * For more information on using Blender browse to http://www.blender.org + * For more information on using Blender browse to https://www.blender.org * */ diff --git a/doc/python_api/examples/bpy.app.translations.py b/doc/python_api/examples/bpy.app.translations.py index d18344f43be..866ad3234ff 100644 --- a/doc/python_api/examples/bpy.app.translations.py +++ b/doc/python_api/examples/bpy.app.translations.py @@ -24,8 +24,8 @@ Then, call ``bpy.app.translations.register(__name__, your_dict)`` in your ``regi The ``Manage UI translations`` add-on has several functions to help you collect strings to translate, and generate the needed python code (the translation dictionary), as well as optional intermediary po files if you want some... See -`How to Translate Blender <https://wiki.blender.org/index.php/Dev:Doc/Process/Translate_Blender>`_ and -`Using i18n in Blender Code <https://wiki.blender.org/index.php/Dev:Source/Interface/Internationalization>`_ +`How to Translate Blender <https://wiki.blender.org/wiki/Process/Translate_Blender>`_ and +`Using i18n in Blender Code <https://wiki.blender.org/wiki/Source/Interface/Internationalization>`_ for more info. Module References @@ -36,7 +36,7 @@ Module References import bpy # This block can be automatically generated by UI translations addon, which also handles conversion with PO format. -# See also https://wiki.blender.org/index.php/Dev:Doc/Process/Translate_Blender#Translating_non-official_addons +# See also https://wiki.blender.org/wiki/Process/Translate_Blender#Translating_non-official_addons # It can (should) also be put in a different, specific py file. # ##### BEGIN AUTOGENERATED I18N SECTION ##### diff --git a/release/scripts/startup/bl_operators/uvcalc_follow_active.py b/release/scripts/startup/bl_operators/uvcalc_follow_active.py index 5c870849cc5..414fc9c7b32 100644 --- a/release/scripts/startup/bl_operators/uvcalc_follow_active.py +++ b/release/scripts/startup/bl_operators/uvcalc_follow_active.py @@ -19,7 +19,7 @@ # <pep8 compliant> # for full docs see... -# http://mediawiki.blender.org/index.php/Scripts/Manual/UV_Calculate/Follow_active_quads +# https://docs.blender.org/manual/en/dev/editors/uv_image/uv/editing/unwrapping/mapping_types.html#follow-active-quads import bpy from bpy.types import Operator diff --git a/release/text/readme.html b/release/text/readme.html index 45bff37b025..47c8596e996 100644 --- a/release/text/readme.html +++ b/release/text/readme.html @@ -38,7 +38,7 @@ For more information, visit <a href="http://www.blender.org/"><span class="s1">b <p class="p3"><b>BLENDER_VERSION</b></p> <p class="p4"> The Blender Foundation and online developer community is proud to present Blender BLENDER_VERSION. -<a href="http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/BLENDER_VERSION"> +<a href="https://wiki.blender.org/wiki/Reference/Release_Notes/BLENDER_VERSION"> <span class="s1">More information about this release</span></a>. </p> <p class="p2"><br></p> @@ -100,8 +100,8 @@ For more information on how to use Blender, <p class="p5"> <span class="s3">General information <a href="http://www.blender.org/"> <span class="s4">www.blender.org</span></a> <br> -Full release log <a href="http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/BLENDER_VERSION"> -<span class="s4">wiki.blender.org/index.php/Dev:Ref/Release_Notes/BLENDER_VERSION</span></a><br> +Full release log <a href="https://wiki.blender.org/wiki/Reference/Release_Notes/BLENDER_VERSION"> +<span class="s4">wiki.blender.org/wiki/Reference/Release_Notes/BLENDER_VERSION</span></a><br> Tutorials <a href="http://www.blender.org/support/tutorials/"> <span class="s4">www.blender.org/support/tutorials/</span></a> <br> Manual <a href="https://docs.blender.org/manual/en/dev/"><span class="s4">https://docs.blender.org/manual/en/dev/</span></a><br> diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index d2d78167fae..6517cc271cc 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -784,7 +784,7 @@ bool PyC_IsInterpreterActive(void) } /* Would be nice if python had this built in - * See: http://wiki.blender.org/index.php/Dev:Doc/Tools/Debugging/PyFromC + * See: https://wiki.blender.org/wiki/Tools/Debugging/PyFromC */ void PyC_RunQuicky(const char *filepath, int n, ...) { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 3ef9e234ab4..c1efce45e03 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1574,7 +1574,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar "http://www.blender.org/foundation/donation-payment/"); uiItemStringO(col, IFACE_("Credits"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/about/credits/"); - BLI_snprintf(url, sizeof(url), "http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/%d.%d", + BLI_snprintf(url, sizeof(url), "https://wiki.blender.org/wiki/Reference/Release_Notes/%d.%d", BLENDER_VERSION / 100, BLENDER_VERSION % 100); uiItemStringO(col, IFACE_("Release Log"), ICON_URL, "WM_OT_url_open", "url", url); uiItemStringO(col, IFACE_("Manual"), ICON_URL, "WM_OT_url_open", "url", |