← Back to branch summary

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

« back to all changes in this revision

Viewing changes to intern/elbeem/intern/solver_class.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/solver_class.h
100
100
 
101
101
// sirdude fix for solaris
102
102
#if !defined(linux) && defined(sun)
 
103
#include "ieeefp.h"
103
104
#ifndef expf
104
105
#define expf(x) exp((double)(x))
105
106
#endif
106
107
#endif
107
108
 
 
109
#include "solver_control.h"
 
110
 
108
111
#if LBM_INCLUDE_TESTSOLVERS==1
109
112
#include "solver_test.h"
110
113
#endif // LBM_INCLUDE_TESTSOLVERS==1
497
500
                LbmFloat& debRAC(LbmFloat* s,int l);
498
501
#               endif // FSGR_STRICT_DEBUG==1
499
502
 
 
503
                LbmControlData *mpControl;
 
504
 
 
505
                void initCpdata();
 
506
                void handleCpdata();
 
507
                void cpDebugDisplay(int dispset); 
 
508
 
500
509
                bool mUseTestdata;
501
510
#               if LBM_INCLUDE_TESTSOLVERS==1
502
511
                // test functions
506
515
                void handleTestdata();
507
516
                void set3dHeight(int ,int );
508
517
 
509
 
                void initCpdata();
510
 
                void handleCpdata();
511
 
                void cpDebugDisplay(int dispset);
512
 
 
513
518
                int mMpNum,mMpIndex;
514
519
                int mOrgSizeX;
515
520
                LbmFloat mOrgStartX;