Merged changes in the trunk up to revision 29184.

3 files changed, 15 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 55b8374656a..7c3641db379 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -117,7 +117,7 @@ typedef struct Library {
 	ID *idblock;
 	struct FileData *filedata;
 	char name[240];			/* path name used for reading, can be relative and edited in the outliner */
-	char filename[240];		/* temp. absolute filepath, only used while reading */
+	char filepath[240];		/* temp. absolute filepath, only used while reading */
 	int tot, pad;			/* tot, idblock and filedata are only fo read and write */
 	struct Library *parent;	/* set for indirectly linked libs, used in the outliner and while reading */
 } Library;
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 2c5c50d7dc2..b6f72875c29 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -190,8 +190,12 @@ typedef struct VoxelData {
 	float int_multiplier;	
 	int still_frame;
 	char source_path[240];
+
+	/* temporary data */
 	float *dataset;
- 
+	int cachedframe;
+	int ok;
+	
 } VoxelData;
 
 typedef struct Tex {
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index e1c3dcf82c4..ed52316990e 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -96,7 +96,16 @@ typedef struct ReportList {
 	int printlevel; /* ReportType */
 	int storelevel; /* ReportType */
 	int flag, pad;
+	struct wmTimer *reporttimer;
 } ReportList;
+
+/* timer customdata to control reports display */
+typedef struct ReportTimerInfo {
+	float col[3];
+	float greyscale;
+	float widthfac;
+} ReportTimerInfo;
+
 /* reports need to be before wmWindowManager */