From bd4fe1b71dea85947f4d670ea749d7e07a2ed83c Mon Sep 17 00:00:00 2001 From: Xavier Thomas Date: Mon, 10 May 2010 03:42:22 +0000 Subject: Fix for histogram Luma mode not working when waveform is in RGB mode. Also unified the scope vocabulary. --- source/blender/makesdna/DNA_color_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/makesdna') 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 -- cgit v1.2.3 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') 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 From e5445302266323a5961350e2a8f465961680219d Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 12 May 2010 08:34:15 +0000 Subject: Logic UI: Controller State http://www.pasteall.org/pic/show.php?id=3255 New design, with an option to hide/unhide it. Matt: 1) the way I managed to have the I selected is kind of nasty :) but I think it will have to wait for proper icons. 2) the ALL is so far only working visually, It's still have to change the code to make all sensors and actuators visible when ALL is on. I think this is better than actually marking all states as before (2.49). Maybe it's even nicer nice to have not only have the states disactivated (in gray as they are now), but also to show them as temporary marked. Is that interesting/possible? 3) Can't centralize it :( 4) I think you are right, the icons are nice, but uninformative ... for someone else curious: http://www.pasteall.org/pic/show.php?id=3254 --- source/blender/makesdna/DNA_object_types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna') 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 -- cgit v1.2.3