Merged changes in the trunk up to revision 36551.
[blender.git] / source / blender / makesdna / DNA_scene_types.h
index a72f6d46c9724f13ffb7129c6420c9e8bde2df96..9f4d38688c1fae5ef9c0c55c6be9db8344b7c4c8 100644 (file)
@@ -502,6 +502,7 @@ typedef struct GameData {
 #define GAME_IGNORE_DEPRECATION_WARNINGS       (1 << 12)
 #define GAME_ENABLE_ANIMATION_RECORD           (1 << 13)
 #define GAME_SHOW_MOUSE                                                (1 << 14)
+#define GAME_GLSL_NO_COLOR_MANAGEMENT          (1 << 15)
 
 /* GameData.matmode */
 #define GAME_MAT_TEXFACE       0
@@ -1164,6 +1165,7 @@ typedef enum SculptFlags {
        SCULPT_LOCK_Z = (1<<5),
        SCULPT_SYMMETRY_FEATHER = (1<<6),
        SCULPT_USE_OPENMP = (1<<7),
+       SCULPT_ONLY_DEFORM = (1<<8),
 } SculptFlags;
 
 /* sculpt_paint_settings */