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:
authorWeizhen Huang <itsnotrj@gmail.com>2022-11-11 18:17:58 +0300
committerWeizhen Huang <itsnotrj@gmail.com>2022-11-11 18:17:58 +0300
commitdad3574a8c0b673efa9d7f7c890d9562e3f6a267 (patch)
tree84dff4a90c34a44744c329de21a999289f9d209a /intern/cycles/blender/addon/properties.py
parente9260afa93068d0181de6e3223f65e7bb016aecc (diff)
parentdc8a1d38b73420428f9fb878386b99ebb69dd841 (diff)
Merge branch 'master' into soc-2022-many-lights-sampling
Diffstat (limited to 'intern/cycles/blender/addon/properties.py')
-rw-r--r--intern/cycles/blender/addon/properties.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 86e9b75397a..9497dc7a99b 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -290,7 +290,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
)
shading_system: BoolProperty(
name="Open Shading Language",
- description="Use Open Shading Language (CPU rendering only)",
+ description="Use Open Shading Language",
)
preview_pause: BoolProperty(