← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/KX_BlenderScalarInterpolator.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/Converter/KX_BlenderScalarInterpolator.h
55
55
 
56
56
 
57
57
#ifdef WITH_CXX_GUARDEDALLOC
58
 
public:
59
 
        void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ScalarInterpolator"); }
60
 
        void operator delete( void *mem ) { MEM_freeN(mem); }
 
58
        MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ScalarInterpolator")
61
59
#endif
62
60
};
63
61
 
67
65
        BL_InterpolatorList(struct bAction *action);
68
66
        ~BL_InterpolatorList();
69
67
 
70
 
        KX_IScalarInterpolator *GetScalarInterpolator(const char *rna_path, int array_index);   
 
68
        KX_IScalarInterpolator *GetScalarInterpolator(const char *rna_path, int array_index);
71
69
 
72
70
 
73
71
#ifdef WITH_CXX_GUARDEDALLOC
74
 
public:
75
 
        void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_InterpolatorList"); }
76
 
        void operator delete( void *mem ) { MEM_freeN(mem); }
 
72
        MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_InterpolatorList")
77
73
#endif
78
74
};
79
75
 
80
 
#endif //__KX_BLENDERSCALARINTERPOLATOR_H__
81
 
 
 
76
#endif  /* __KX_BLENDERSCALARINTERPOLATOR_H__ */