svn merge ^/trunk/blender -r49890:49917
[blender.git] / source / blender / makesdna / DNA_node_types.h
index ffb16b96b5539e644204f79ce0d29b57e037fcc9..541593aa8107ef78bbbebf592554d846d6266f80 100644 (file)
@@ -614,7 +614,10 @@ typedef struct NodeTexSky {
 typedef struct NodeTexImage {
        NodeTexBase base;
        ImageUser iuser;
 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 {
 } NodeTexImage;
 
 typedef struct NodeTexChecker {
@@ -624,7 +627,8 @@ typedef struct NodeTexChecker {
 typedef struct NodeTexEnvironment {
        NodeTexBase base;
        ImageUser iuser;
 typedef struct NodeTexEnvironment {
        NodeTexBase base;
        ImageUser iuser;
-       int color_space, projection;
+       int color_space;
+       int projection;
 } NodeTexEnvironment;
 
 typedef struct NodeTexGradient {
 } NodeTexEnvironment;
 
 typedef struct NodeTexGradient {
@@ -764,6 +768,10 @@ typedef struct NodeTrackPosData {
 #define SHD_PROJ_EQUIRECTANGULAR       0
 #define SHD_PROJ_MIRROR_BALL           1
 
 #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
 /* blur node */
 #define CMP_NODE_BLUR_ASPECT_NONE              0
 #define CMP_NODE_BLUR_ASPECT_Y                 1