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:
authorPeter Schlaile <peter@schlaile.de>2006-05-06 19:26:53 +0400
committerPeter Schlaile <peter@schlaile.de>2006-05-06 19:26:53 +0400
commit5f571e4ded613ac46242affa2cea90135077d323 (patch)
treef80ebe58bab5a7f74634676e1f4cf93861baafa2 /source/blender/makesdna/DNA_texture_types.h
parent5a9b917ea4056694d31b61a185d859ce368e968c (diff)
==Bugfix==
Made the frame boost from short to int (30000 -> 300000 frames) complete by walking through the source and finally changing all frame-variables to ints. This should finally fix the framecounter warp around seen in some buttons. If you step on any further problems that may arise starting from frame 32768 please just give me a hint and I'll fix it. (Sorry about that, didn't know enough about Blender, when I did it the first time...)
Diffstat (limited to 'source/blender/makesdna/DNA_texture_types.h')
-rw-r--r--source/blender/makesdna/DNA_texture_types.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index ca77a04bd22..e4d59687cfa 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -115,10 +115,10 @@ typedef struct EnvMap {
float obimat[3][3];
short type, stype;
float clipsta, clipend;
- float viewscale, pad; /* viewscale is for planar envmaps to zoom in or out */
+ float viewscale; /* viewscale is for planar envmaps to zoom in or out */
unsigned int notlay;
short cuberes, depth;
- short ok, lastframe;
+ int ok, lastframe;
short recalc, lastsize;
} EnvMap;
@@ -149,9 +149,11 @@ typedef struct Tex {
float cropxmin, cropymin, cropxmax, cropymax;
short xrepeat, yrepeat;
- short extend, len;
+ short extend;
+ short fie_ima;
+ int len;
float checkerdist, nabla;
- short frames, offset, sfra, fie_ima;
+ int frames, offset, sfra;
float norfac;
struct Ipo *ipo;
@@ -160,7 +162,7 @@ typedef struct Tex {
struct ColorBand *coba;
struct EnvMap *env;
- short fradur[4][2];
+ int fradur[4][2];
} Tex;