← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/GameLogic/SCA_ExpressionController.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/GameLogic/SCA_ExpressionController.h
59
59
 
60
60
 
61
61
#ifdef WITH_CXX_GUARDEDALLOC
62
 
public:
63
 
        void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ExpressionController"); }
64
 
        void operator delete( void *mem ) { MEM_freeN(mem); }
 
62
        MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_ExpressionController")
65
63
#endif
66
64
};
67
65
 
68
 
#endif //__SCA_EXPRESSIONCONTROLLER_H__
69
 
 
 
66
#endif  /* __SCA_EXPRESSIONCONTROLLER_H__ */