← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to intern/elbeem/intern/ntl_ray.h

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/elbeem/intern/ntl_ray.h
20
20
class ntlTree;
21
21
class ntlScene;
22
22
class ntlRenderGlobals;
 
23
class ntlGeometryObject;
23
24
 
24
25
//! store data for an intersection of a ray and a triangle
25
26
// NOT YET USED
323
324
  /* CONSTRUCTORS */
324
325
  /*! Default constructor */
325
326
  ntlScene( ntlRenderGlobals *glob, bool del=true );
326
 
  /*! Default destructor */
327
 
   ~ntlScene();
 
327
  /*! Default destructor  */
 
328
  ~ntlScene();
328
329
 
329
330
        /*! Add an object to the scene */
330
331
        inline void addGeoClass(ntlGeometryClass *geo) {