← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/BL_ShapeDeformer.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/BL_ShapeDeformer.h
32
32
#ifndef __BL_SHAPEDEFORMER_H__
33
33
#define __BL_SHAPEDEFORMER_H__
34
34
 
35
 
#if defined(WIN32) && !defined(FREE_WINDOWS)
36
 
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
37
 
#endif //WIN32
 
35
#ifdef _MSC_VER
 
36
#  pragma warning (disable:4786)  /* get rid of stupid stl-visual compiler debug warning */
 
37
#endif
38
38
 
39
39
#include "BL_SkinDeformer.h"
40
40
#include "BL_DeformableGameObject.h"
73
73
        };
74
74
 
75
75
protected:
76
 
        bool                    m_useShapeDrivers;      
 
76
        bool                    m_useShapeDrivers;
77
77
        double                  m_lastShapeUpdate;
78
78
        struct Key*             m_key;
79
79
 
80
80
 
81
81
#ifdef WITH_CXX_GUARDEDALLOC
82
 
public:
83
 
        void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
84
 
        void operator delete( void *mem ) { MEM_freeN(mem); }
 
82
        MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ShapeDeformer")
85
83
#endif
86
84
};
87
85