Merge branch 'master' into blender2.8

17 files changed, 20 insertions, 20 deletions

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index be983ebff4a..a8519f54d0a 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -339,7 +339,7 @@ OSL_FORCE_REBUILD=false
 OSL_SKIP=false
 
 # OpenSubdiv needs to be compiled for now
-OSD_VERSION="3.1.0"
+OSD_VERSION="3.1.1"
 OSD_VERSION_MIN=$OSD_VERSION
 OSD_FORCE_BUILD=false
 OSD_FORCE_REBUILD=false
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index e8154f9ea66..ec3131ca19e 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/doc/python_api/sphinx_doc_update.py b/doc/python_api/sphinx_doc_update.py
index c7f0367a2a0..3d48c1145e1 100755
--- a/doc/python_api/sphinx_doc_update.py
+++ b/doc/python_api/sphinx_doc_update.py
@@ -41,9 +41,9 @@ import tempfile
 import zipfile
 
 
-DEFAULT_RSYNC_SERVER = "www.blender.org"
+DEFAULT_RSYNC_SERVER = "docs.blender.org"
 DEFAULT_RSYNC_ROOT = "/api/"
-DEFAULT_SYMLINK_ROOT = "/data/www/vhosts/www.blender.org/api"
+DEFAULT_SYMLINK_ROOT = "/data/www/vhosts/docs.blender.org/api"
 
 
 def argparse_create():
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 1fc3758ad4d..235d19e91e8 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 233f94be1bf..dafac6dfcb3 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
-Subproject dc166057192ea882b5cc70484d4c8bacd7cb41b
+Subproject 88158191df4da2109bbfd9b0816d891bbc7fc78
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 06dad53c80801e0e0919f086040e3d9c31bbd0a
+Subproject a746a84f8aaf3a4843eb3f4ce3f5a0464872077
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 04af69be141a5757fc60b44cc1a5b72db524af3
+Subproject 029103debce43110f93295d7633931ec100d301
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index d77113ef7fc..fcb30130730 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 d294838d3a2..56e6e79b94f 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 8e08a8ba027..45bff37b025 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/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 06321700dc0..92b186d7329 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -264,7 +264,7 @@ typedef struct ModifierTypeInfo {
 	 *
 	 * This function is optional.
 	 */
-	/* TODO(sergey): Remove once we finalyl switched to the new depsgraph. */
+	/* TODO(sergey): Remove once we finally switched to the new depsgraph. */
 	void (*updateDepsgraph)(struct ModifierData *md,
 	                        struct Main *bmain,
 	                        struct Scene *scene,
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 25cd7265c3e..6e0d6ad2bcd 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -784,11 +784,16 @@ static void rna_GPencilPalette_info_set(PointerRNA *ptr, const char *value)
 	bGPdata *gpd = ptr->id.data;
 	bGPDpalette *palette = ptr->data;
 
+	char oldname[64] = "";
+	BLI_strncpy(oldname, palette->info, sizeof(oldname));
+
 	/* copy the new name into the name slot */
 	BLI_strncpy_utf8(palette->info, value, sizeof(palette->info));
 
 	BLI_uniquename(&gpd->palettes, palette, DATA_("GP_Palette"), '.', offsetof(bGPDpalette, info),
 	               sizeof(palette->info));
+	/* now fix animation paths */
+	BKE_animdata_fix_paths_rename_all(&gpd->id, "palettes", oldname, palette->info);
 }
 
 static char *rna_GPencilPalette_path(PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index e68e67586e9..0eab38faca8 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 7c68a0ce438..a8abc3bb54f 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1850,7 +1850,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"
@@ -4603,4 +4603,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 438c577d06f..3b6cd1c9561 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -436,7 +436,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
-Subproject 896c5f78952adb2d091d28c65086d46992dabda
+Subproject 6bbb68073bfa11e94bb0b3623db38f847037add