diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-12-06 21:52:55 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-12-06 21:52:55 +0300 |
| commit | 4cf83c2c14e5c15c3fc6522bd14081b45699e962 (patch) | |
| tree | aa3dc6332c5b07c2ed85c46c08687e162e41aaac /source/blender/src/buttons_logic.c | |
| parent | 39ca3e3fa411e2a14bdfb71fe20823c8b85b775b (diff) | |
Fix for bug #3529
Provided by Jorge Bernal (lordloki)
Function was returning a wrong value in a switch statement.
Kent
Diffstat (limited to 'source/blender/src/buttons_logic.c')
| -rw-r--r-- | source/blender/src/buttons_logic.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index f56aefbeedd..9933a907897 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -34,10 +34,6 @@ #include <math.h> #include <string.h> -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifndef WIN32 #include <unistd.h> #else @@ -714,7 +710,7 @@ static char *actuator_name(int type) case ACT_GAME: return "Game"; case ACT_VISIBILITY: - return "Game"; + return "Visibility"; } return "unknown"; } @@ -1444,14 +1440,14 @@ static int get_col_actuator(int type) case ACT_SOUND: return TH_BUT_SETTING2; case ACT_CD: return TH_BUT_NUM; case ACT_CAMERA: return TH_BUT_TEXTFIELD; - case ACT_EDIT_OBJECT: return TH_BUT_POPUP; + case ACT_EDIT_OBJECT: return TH_BUT_POPUP; case ACT_GROUP: return TH_BUT_ACTION; case ACT_RANDOM: return TH_BUT_NEUTRAL; case ACT_SCENE: return TH_BUT_SETTING; case ACT_MESSAGE: return TH_BUT_SETTING1; case ACT_GAME: return TH_BUT_SETTING2; - case ACT_VISIBILITY: return TH_BUT_NUM; - case ACT_CONSTRAINT: return TH_BUT_ACTION; + case ACT_VISIBILITY: return TH_BUT_NUM; + case ACT_CONSTRAINT: return TH_BUT_ACTION; default: return TH_BUT_NEUTRAL; } } |