~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/BKE_global.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
 * any data in Blender. This block is not serialized, but built anew
6
6
 * for every fresh Blender run.
7
7
 *
8
 
 * $Id: BKE_global.h 16902 2008-10-03 19:34:49Z blendix $ 
 
8
 * $Id: BKE_global.h 17961 2008-12-19 20:35:53Z ben2610 $ 
9
9
 *
10
10
 * ***** BEGIN GPL LICENSE BLOCK *****
11
11
 *
227
227
#define G_FILE_GLSL_NO_RAMPS     (1 << 19)
228
228
#define G_FILE_GLSL_NO_NODES     (1 << 20)
229
229
#define G_FILE_GLSL_NO_EXTRA_TEX (1 << 21)
 
230
#define G_FILE_IGNORE_DEPRECATION_WARNINGS      (1 << 22)
230
231
 
231
232
/* G.windowstate */
232
233
#define G_WINDOWSTATE_USERDEF           0