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

« back to all changes in this revision

Viewing changes to source/gameengine/GameLogic/SCA_AlwaysSensor.cpp

  • 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
* 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:
32
32
 *  \ingroup gamelogic
33
33
 */
34
34
 
35
 
 
36
 
#if defined(WIN32) && !defined(FREE_WINDOWS)
37
 
// This warning tells us about truncation of __long__ stl-generated names.
38
 
// It can occasionally cause DevStudio to have internal compiler warnings.
39
 
#pragma warning( disable : 4786 )     
 
35
#ifdef _MSC_VER
 
36
  /* This warning tells us about truncation of __long__ stl-generated names.
 
37
   * It can occasionally cause DevStudio to have internal compiler warnings. */
 
38
#  pragma warning( disable:4786 )
40
39
#endif
41
40
 
42
41
#include "SCA_AlwaysSensor.h"