diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-04-21 12:49:06 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-04-21 12:49:06 +0400 |
commit | cf9886b0d0cd945c05f4e41173604c6663415797 (patch) | |
tree | 95e71b06d9f0dd406b07027b5b57c08eaa45113e /source/blender/render/intern/include/voxeldata.h | |
parent | 8a0a557294b61f67cdfc36c2c4163b3a88f71689 (diff) | |
parent | 2d0d06f642b661b084657c05ebb0c664f998a937 (diff) |
2nd try to merge sim_physics with trunk rev 19825
Please check if volumetrics are yet working
Diffstat (limited to 'source/blender/render/intern/include/voxeldata.h')
-rw-r--r-- | source/blender/render/intern/include/voxeldata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/voxeldata.h b/source/blender/render/intern/include/voxeldata.h index 190a5a5a1c4..36c7789da80 100644 --- a/source/blender/render/intern/include/voxeldata.h +++ b/source/blender/render/intern/include/voxeldata.h @@ -42,7 +42,7 @@ int resolX, resolY, resolZ; int frames; } VoxelDataHeader; -inline int _I(int x, int y, int z, int *n); +__inline int _I(int x, int y, int z, int *n); void make_voxeldata(struct Render *re); void free_voxeldata(struct Render *re); int voxeldatatex(struct Tex *tex, float *texvec, struct TexResult *texres); |