← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/render/intern/include/texture_ocean.h

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/render/intern/include/texture_ocean.h
26
26
#ifndef __TEXTURE_OCEAN_H__
27
27
#define __TEXTURE_OCEAN_H__
28
28
 
 
29
/** \file blender/render/intern/include/texture_ocean.h
 
30
 *  \ingroup render
 
31
 */
 
32
 
29
33
int ocean_texture(struct Tex *tex, const float texvec[2], struct TexResult *texres);
30
34
 
31
35
#endif  /* __TEXTURE_OCEAN_H__ */