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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-30 10:10:16 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-30 10:10:16 +0400
commite7f594b0df56c99b19ce2eda50d7ca8872ac21e6 (patch)
tree0b0e97576b6782034339e8bf5961b846949a29d9 /intern/cycles/kernel/shaders/node_convert_from_vector.osl
parent6bb45495d11e6547c847aee59dc86ca28adf472b (diff)
Fix #33347: cycles OSL crash connecting string to vector socket.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_convert_from_vector.osl')
-rw-r--r--intern/cycles/kernel/shaders/node_convert_from_vector.osl1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/node_convert_from_vector.osl b/intern/cycles/kernel/shaders/node_convert_from_vector.osl
index 4516f92c753..ae9f97414d5 100644
--- a/intern/cycles/kernel/shaders/node_convert_from_vector.osl
+++ b/intern/cycles/kernel/shaders/node_convert_from_vector.osl
@@ -20,6 +20,7 @@
shader node_convert_from_vector(
vector Vector = vector(0.0, 0.0, 0.0),
+ output string String = "",
output float Val = 0.0,
output int ValInt = 0,
output color Color = color(0.0, 0.0, 0.0),