From 8828234902dad6bf04ccde87cf64e844917047d3 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 11 May 2010 06:56:59 +0000 Subject: 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. --- source/blender/makesdna/DNA_sensor_types.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/makesdna/DNA_sensor_types.h') 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 -- cgit v1.2.3