[Bf-blender-cvs] [91c9be7df3d] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 91c9be7df3dd0ab6cdc67268e358b56bf30ea8dc
Author: Bastien Montagne
Date:   Wed Dec 12 12:04:17 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB91c9be7df3dd0ab6cdc67268e358b56bf30ea8dc

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_operators/wm.py
index 164f1100e83,0f3052f64c2..35afc82ed55
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@@ -1022,11 -1037,11 +1022,11 @@@ class WM_OT_doc_view(Operator)
      bl_idname = "wm.doc_view"
      bl_label = "View Documentation"
  
 -    doc_id = doc_id
 +    doc_id: doc_id
      if bpy.app.version_cycle == "release":
-         _prefix = ("https://docs.blender.org/api/blender_python_api_current")
+         _prefix = ("https://docs.blender.org/api/current")
      else:
-         _prefix = ("https://docs.blender.org/api/blender_python_api_master")
+         _prefix = ("https://docs.blender.org/api/master")
  
      def execute(self, context):
          url = _wm_doc_get_id(self.doc_id, do_url=True, url_prefix=self._prefix)