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/kernel/svm/svm_types.h
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/kernel/svm/svm_types.h')
-rw-r--r--intern/cycles/kernel/svm/svm_types.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index fd440c9bf91..af188477a73 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -309,7 +309,9 @@ typedef enum NodeTangentAxis {
typedef enum NodeNormalMapSpace {
NODE_NORMAL_MAP_TANGENT,
NODE_NORMAL_MAP_OBJECT,
- NODE_NORMAL_MAP_WORLD
+ NODE_NORMAL_MAP_WORLD,
+ NODE_NORMAL_MAP_BLENDER_OBJECT,
+ NODE_NORMAL_MAP_BLENDER_WORLD,
} NodeNormalMapSpace;
typedef enum ShaderType {