svn merge ^/trunk/blender -r49854:49867
[blender.git] / source / blender / makesdna / DNA_node_types.h
index 3f439454a97aad84ec1e79a7ff1e5f56a7e245be..54c1b1bb77322fe3f87cabdc211063e00f77d5d5 100644 (file)
@@ -611,7 +611,10 @@ typedef struct NodeTexSky {
 typedef struct NodeTexImage {
        NodeTexBase base;
        ImageUser iuser;
-       int color_space, pad;
+       int color_space;
+       int projection;
+       float projection_blend;
+       int pad;
 } NodeTexImage;
 
 typedef struct NodeTexChecker {
@@ -621,7 +624,8 @@ typedef struct NodeTexChecker {
 typedef struct NodeTexEnvironment {
        NodeTexBase base;
        ImageUser iuser;
-       int color_space, projection;
+       int color_space;
+       int projection;
 } NodeTexEnvironment;
 
 typedef struct NodeTexGradient {
@@ -761,6 +765,10 @@ typedef struct NodeTrackPosData {
 #define SHD_PROJ_EQUIRECTANGULAR       0
 #define SHD_PROJ_MIRROR_BALL           1
 
+/* image texture */
+#define SHD_PROJ_FLAT                          0
+#define SHD_PROJ_BOX                           1
+
 /* blur node */
 #define CMP_NODE_BLUR_ASPECT_NONE              0
 #define CMP_NODE_BLUR_ASPECT_Y                 1