diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
| commit | e6e265b2b59e02cc7816a2ed43471eca8bca0a62 (patch) | |
| tree | e312d2c2f6cb1aaf79148648e5725902ab23d34e /source/blender/blenkernel/BKE_texture.h | |
| parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
| parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) | |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/BKE_texture.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_texture.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index 508fef8d9a4..52fa52a5899 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -46,6 +46,7 @@ struct Lamp; struct LampRen; struct Material; struct MTex; +struct OceanTex; struct ParticleSettings; struct PluginTex; struct PointDensity; @@ -125,6 +126,10 @@ void BKE_free_voxeldata(struct VoxelData *vd); struct VoxelData *BKE_add_voxeldata(void); struct VoxelData *BKE_copy_voxeldata(struct VoxelData *vd); +void BKE_free_oceantex(struct OceanTex *ot); +struct OceanTex *BKE_add_oceantex(void); +struct OceanTex *BKE_copy_oceantex(struct OceanTex *ot); + int BKE_texture_dependsOnTime(const struct Tex *texture); #ifdef __cplusplus |