diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-15 01:50:15 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-15 01:50:15 +0400 |
| commit | cfc351afee68d99e65c74af450afd7bf82abcdf2 (patch) | |
| tree | 80b72e483535b24160301b96f361a25f524236e8 /source/blender/makesdna | |
| parent | bc993fcd55069906c43e1840003bb9a4f394e269 (diff) | |
| parent | cd6332ca1ef3eab73a9db312ba7a790902391c4b (diff) | |
Merged changes in the trunk up to revision 28772.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_color_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_sensor_types.h | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h index 2881ec127c8..bc35d379334 100644 --- a/source/blender/makesdna/DNA_color_types.h +++ b/source/blender/makesdna/DNA_color_types.h @@ -133,7 +133,7 @@ typedef struct Scopes { } Scopes; /* scopes->wavefrm_mode */ -#define SCOPES_WAVEFRM_LUM 0 +#define SCOPES_WAVEFRM_LUMA 0 #define SCOPES_WAVEFRM_RGB 1 #define SCOPES_WAVEFRM_YCC_601 2 #define SCOPES_WAVEFRM_YCC_709 3 diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 698492e6715..f50909e641b 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -496,9 +496,10 @@ extern Object workob; #define OB_ADDCONT 512 #define OB_ADDACT 1024 #define OB_SHOWCONT 2048 -#define OB_SETSTBIT 4096 +#define OB_ALLSTATE 4096 #define OB_INITSTBIT 8192 #define OB_DEBUGSTATE 16384 +#define OB_SHOWSTATE 32768 /* ob->restrictflag */ #define OB_RESTRICT_VIEW 1 diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h index 6f4b191419e..d7256b5b9e0 100644 --- a/source/blender/makesdna/DNA_sensor_types.h +++ b/source/blender/makesdna/DNA_sensor_types.h @@ -260,8 +260,7 @@ typedef struct bJoystickSensor { * ... The reason for this is that we need to be backward compatible, * and have a proper default value for this thing. * */ -/* #define SENS_COLLISION_PROPERTY 0 */ -#define SENS_COLLISION_PROPERTY 0 // uncommenting to use with RNA/UI. will check if it's working/fix it later - dfelinto +#define SENS_COLLISION_PROPERTY 0 #define SENS_COLLISION_MATERIAL 1 #define SENS_COLLISION_PULSE 2 |