diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2010-05-11 10:56:59 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2010-05-11 10:56:59 +0400 |
| commit | 8828234902dad6bf04ccde87cf64e844917047d3 (patch) | |
| tree | cc5fc8fb696d3ff50ec5549e0873fb3502302acd /source/blender/makesdna/DNA_sensor_types.h | |
| parent | daba1d23ff512ef0db32bdde3a26f120d3d9f024 (diff) | |
Logic UI: using the RNA interface as default - commit pre-subversion bumping (i.e. no DNA changes here)
Also: extra set funcs, layout adjustments
The patch for the subversion commit was getting too big, and it will be hard to distinguish what was essentially do_version + DNA changes and what was layout adjustments.
So this is the first part of the commit. The next may take a bit more because I'm not so confident in my readfile changes.
Diffstat (limited to 'source/blender/makesdna/DNA_sensor_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_sensor_types.h | 3 |
1 files changed, 1 insertions, 2 deletions
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 |