diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-24 16:56:56 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-24 16:56:56 +0300 |
commit | 5be2a62ca3c93add06e606c05592f7f4a1530ddd (patch) | |
tree | 6bbe9e37f77b0d5a1f65fba71bcb624f8c4747b8 /intern | |
parent | f286e7e017ffd665db86b2f47a5c72c416914834 (diff) | |
parent | b6ccba9241ab099e456ef3789dd28d106607ef18 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/__init__.py | 2 | ||||
-rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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; } } |