Animation Editors - Texture Animation:

Texture animation is now shown in the animation editors. Texture stacks are shown for each Material/Lamp/World block that uses them.

There is currently still a bit of a bug with this which means that unless the owner of the texture stack is animated too, the animation data for the textures won't show up. This will get rectified soon though.

5 files changed, 15 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 278f54db3a9..f76a7f6140e 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -537,6 +537,7 @@ typedef enum eDopeSheet_FilterFlag {
 	ADS_FILTER_NOMBA			= (1<<17),
 	ADS_FILTER_NOARM			= (1<<18),
 	ADS_FILTER_NONTREE			= (1<<19),
+	ADS_FILTER_NOTEX			= (1<<20),
 	
 		/* NLA-specific filters */
 	ADS_FILTER_NLA_NOACT		= (1<<25),	/* if the AnimData block has no NLA data, don't include to just show Action-line */
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 665cb1c3819..cb458708b3e 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -115,6 +115,10 @@ typedef struct Lamp {
 
 /* flag */
 #define LA_DS_EXPAND	1
+	/* NOTE: this must have the same value as MA_DS_SHOW_TEXS, 
+	 * otherwise anim-editors will not read correctly
+	 */
+#define LA_DS_SHOW_TEXS	4
 
 /* type */
 #define LA_LOCAL		0
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index fa6cddd8227..f8eb6e76693 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -181,6 +181,11 @@ typedef struct Material {
 #define MA_IS_USED		1
 		/* for dopesheet */
 #define MA_DS_EXPAND	2
+		/* for dopesheet (texture stack expander)
+		 * NOTE: this must have the same value as other texture stacks, 
+		 * otherwise anim-editors will not read correctly
+		 */
+#define MA_DS_SHOW_TEXS	4
 
 /* mode (is int) */
 #define MA_TRACEBLE		1
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index be8c909271b..5747669d015 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -357,6 +357,7 @@ typedef struct TexMapping {
 #define TEX_REPEAT_XMIR		128
 #define TEX_REPEAT_YMIR		256
 #define TEX_FLAG_MASK		( TEX_COLORBAND | TEX_FLIPBLEND | TEX_NEGALPHA | TEX_CHECKER_ODD | TEX_CHECKER_EVEN | TEX_PRV_ALPHA | TEX_PRV_NOR | TEX_REPEAT_XMIR | TEX_REPEAT_YMIR ) 
+#define TEX_DS_EXPAND		512
 
 /* extend (starts with 1 because of backward comp.) */
 #define TEX_EXTEND		1
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 0c0317ac444..66d31467c4a 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -186,6 +186,10 @@ typedef struct World {
 
 /* flag */
 #define WO_DS_EXPAND	(1<<0)
+	/* NOTE: this must have the same value as MA_DS_SHOW_TEXS, 
+	 * otherwise anim-editors will not read correctly
+	 */
+#define WO_DS_SHOW_TEXS	(1<<2)
 
 #endif