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>2013-05-28 18:24:03 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-28 18:24:03 +0400
commit33d609144ef60c0223b2925cd39a713ed8c9060c (patch)
tree2e1ce05df337214010bef1d1844f265fb0685814 /intern/cycles/render/nodes.cpp
parentef4db04da848a9790e502300285ccd17d71b4646 (diff)
Cycles: normal maps are now backwards compatible again after recent fix, with
a separate Blender Object/World Space that is compatible with Blender render baking and uses the YZ flipping convention.
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
-rw-r--r--intern/cycles/render/nodes.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 84038f13270..f73f04ba61c 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -3344,6 +3344,8 @@ static ShaderEnum normal_map_space_init()
enm.insert("Tangent", NODE_NORMAL_MAP_TANGENT);
enm.insert("Object", NODE_NORMAL_MAP_OBJECT);
enm.insert("World", NODE_NORMAL_MAP_WORLD);
+ enm.insert("Blender Object", NODE_NORMAL_MAP_BLENDER_OBJECT);
+ enm.insert("Blender World", NODE_NORMAL_MAP_BLENDER_WORLD);
return enm;
}