Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-09-21 21:53:52 +0400
committerThomas Dinges <blender@dingto.org>2012-09-21 21:53:52 +0400
commitc39ac85899dbcc29a11bbf959fd87922c1863043 (patch)
treeaf3c010c60d2948d5836e7cf737d3f9eaf66be6c
parentecf6beb8d306ede8f49b2bbffde07e2a1f849715 (diff)
Cycles:
* Change Addons Link to point to the manual instead of the dev documentation. * Add sm_30 to Linux build configuration.
-rw-r--r--build_files/scons/config/linux-config.py2
-rw-r--r--intern/cycles/blender/addon/__init__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py
index 5c16baa2ee8..45f6602e4dd 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -239,7 +239,7 @@ WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST
WITH_BF_CYCLES_CUDA_BINARIES = False
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
WITH_BF_OPENMP = True
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 4a60a329e2b..6292c09fbb1 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -25,7 +25,7 @@ bl_info = {
"location": "Info header, render engine menu",
"description": "Cycles Render Engine integration",
"warning": "",
- "wiki_url": "http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles",
+ "wiki_url": "http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles",
"tracker_url": "",
"support": 'OFFICIAL',
"category": "Render"}