Commit: e5d8c2a67f51261b7865a662d95fb5cb248c2959
Author: Aaron Carlisle
Date: Mon Jan 23 19:09:45 2017 -0500
Branches: master
https://developer.blender.org/rBe5d8c2a67f51261b7865a662d95fb5cb248c2959
Use new manual URL
===================================================================
M doc/python_api/sphinx_doc_gen.py
M intern/cycles/blender/addon/__init__.py
M intern/cycles/device/device_cuda.cpp
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/startup/bl_ui/space_info.py
M release/scripts/templates_py/addon_add_object.py
M release/text/readme.html
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/windowmanager/intern/wm_operators.c
M source/creator/creator_args.c
M source/tools
===================================================================
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index e8154f9ea6..ec3131ca19 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1632,13 +1632,9 @@ def write_sphinx_conf_py(basepath):
file = open(filepath, "w", encoding="utf-8")
fw = file.write
- fw("import sys, os\n")
- fw("\n")
- fw("extensions = ['sphinx.ext.intersphinx']\n")
- fw("\n")
- fw("intersphinx_mapping = {'blender_manual':
('https://www.blender.org/manual/', None)}\n")
- fw("\n")
-
+ fw("import sys, os\n\n")
+ fw("extensions = ['sphinx.ext.intersphinx']\n\n")
+ fw("intersphinx_mapping = {'blender_manual':
('https://docs.blender.org/manual/en/dev/', None)}\n\n")
fw("project = 'Blender'\n")
# fw("master_doc = 'index'\n")
fw("copyright = u'Blender Foundation'\n")
diff --git a/intern/cycles/blender/addon/__init__.py
b/intern/cycles/blender/addon/__init__.py
index 1fc3758ad4..235d19e91e 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -23,7 +23,7 @@ bl_info = {
"location": "Info header, render engine menu",
"description": "Cycles Render Engine integration",
"warning": "",
- "wiki_url": "https://www.blender.org/manual/render/cycles/index.html";,
+ "wiki_url": "https://docs.blender.org/manual/en/dev/render/cycles/";,
"tracker_url": "",
"support": 'OFFICIAL',
"category": "Render"}
diff --git a/intern/cycles/device/device_cuda.cpp
b/intern/cycles/device/device_cuda.cpp
index 233f94be1b..dafac6dfcb 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -130,7 +130,7 @@ public:
{
if(first_error) {
fprintf(stderr, "\nRefer to the Cycles GPU rendering
documentation for possible solutions:\n");
- fprintf(stderr,
"http://www.blender.org/manual/render/cycles/gpu_rendering.html\n\n";);
+ fprintf(stderr,
"https://docs.blender.org/manual/en/dev/render/cycles/gpu_rendering.html\n\n";);
first_error = false;
}
}
diff --git a/release/datafiles/locale b/release/datafiles/locale
index dc16605719..88158191df 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit dc166057192ea882b5cc70484d4c8bacd7cb41b4
+Subproject commit 88158191df4da2109bbfd9b0816d891bbc7fc78b
diff --git a/release/scripts/addons b/release/scripts/addons
index 06dad53c80..a746a84f8a 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 06dad53c80801e0e0919f086040e3d9c31bbd0a1
+Subproject commit a746a84f8aaf3a4843eb3f4ce3f5a0464872077a
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 04af69be14..029103debc 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 04af69be141a5757fc60b44cc1a5b72db524af30
+Subproject commit 029103debce43110f93295d7633931ec100d3017
diff --git a/release/scripts/startup/bl_ui/space_info.py
b/release/scripts/startup/bl_ui/space_info.py
index 780dc4cf98..2a085b8aad 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -306,7 +306,7 @@ class INFO_MT_help(Menu):
layout.operator(
"wm.url_open", text="Manual", icon='HELP',
- ).url = "https://www.blender.org/manual";
+ ).url = "https://docs.blender.org/manual/en/dev/";
layout.operator(
"wm.url_open", text="Release Log", icon='URL',
).url =
"http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/%d.%d"; %
bpy.app.version[:2]
diff --git a/release/scripts/templates_py/addon_add_object.py
b/release/scripts/templates_py/addon_add_object.py
index d294838d3a..56e6e79b94 100644
--- a/release/scripts/templates_py/addon_add_object.py
+++ b/release/scripts/templates_py/addon_add_object.py
@@ -69,7 +69,7 @@ def add_object_button(self, context):
# This allows you to right click on a button and link to the manual
def add_object_manual_map():
- url_manual_prefix = "https://www.blender.org/manual/";
+ url_manual_prefix = "https://docs.blender.org/manual/en/dev/";
url_manual_mapping = (
("bpy.ops.mesh.add_object", "editors/3dview/object"),
)
diff --git a/release/text/readme.html b/release/text/readme.html
index 8e08a8ba02..45bff37b02 100644
--- a/release/text/readme.html
+++ b/release/text/readme.html
@@ -104,7 +104,7 @@ Full release log <a
href="http://wiki.blender.org/index.php/Dev:Ref/Release_Note
<span
class="s4">wiki.blender.org/index.php/Dev:Ref/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="http://www.blender.org/manual";><span
class="s4">www.blender.org/manual</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>
User Forum <a href="http://www.blenderartists.org/";>
<span class="s4">www.blenderartists.org</span></a><br>
IRC <a href="irc://irc.freenode.net/#blenderchat">
diff --git a/source/blender/makesrna/intern/rna_userdef.c
b/source/blender/makesrna/intern/rna_userdef.c
index e68e67586e..0eab38faca 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3937,7 +3937,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
prop = RNA_def_property(srna, "dpi", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "dpi");
- RNA_def_property_range(prop, 48, 144);
+ RNA_def_property_range(prop, 16, 256);
RNA_def_property_ui_text(prop, "DPI", "Font size and resolution for
display");
RNA_def_property_update(prop, 0, "rna_userdef_dpi_update");
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index b9fd4d2e76..ef69ed31ef 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1846,7 +1846,7 @@ static uiBlock *wm_block_create_splash(bContext *C,
ARegion *ar, void *UNUSED(ar
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",
- "http://www.blender.org/manual";);
+ "https://docs.blender.org/manual/en/dev/";);
uiItemStringO(col, IFACE_("Blender Website"), ICON_URL,
"WM_OT_url_open", "url", "http://www.blender.org";);
if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "release")) {
BLI_snprintf(url, sizeof(url),
"http://www.blender.org/documentation/blender_python_api_%d_%d";
@@ -4558,4 +4558,3 @@ EnumPropertyItem *RNA_mask_local_itemf(bContext *C,
PointerRNA *ptr, PropertyRNA
{
return rna_id_itemf(C, ptr, r_free, C ? (ID
*)CTX_data_main(C)->mask.first : NULL, true);
}
-
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 4eb72fb161..27579e58db 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -438,7 +438,7 @@ static void arg_py_context_restore(
* see: `doc/manpage/blender.1.py`
* - Parsed and extracted for the manual,
* which converts our ad-hoc formatting to reStructuredText.
- * see: http://www.blender.org/manual/advanced/command_line.html
+ * see: https://docs.blender.org/manual/en/dev/advanced/command_line.html
*
* \{ */
diff --git a/source/tools b/source/tools
index 896c5f7895..6bbb68073b 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 896c5f78952adb2d091d28c65086d46992dabdac
+Subproject commit 6bbb68073bfa11e94bb0b3623db38f847037add7
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
