Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2007-02-06 02:29:10 +0300
committerJoshua Leung <aligorith@gmail.com>2007-02-06 02:29:10 +0300
commit9217f12c76c3d4a3f05969199e7fd142e7cefea1 (patch)
tree8deb17c39338ae722ab4377696db28f740f26e82 /source/blender/src/header_action.c
parente5d96c2c22f0132aa1375869e7765a46b2f47008 (diff)
Patch #5928 from Diego Borghetti (bdiego)
Blender crashed when selecting column-select options in Action Editor if there was no action active at the time.
Diffstat (limited to 'source/blender/src/header_action.c')
-rw-r--r--source/blender/src/header_action.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c
index 751ffdd16f4..0ab80e000a2 100644
--- a/source/blender/src/header_action.c
+++ b/source/blender/src/header_action.c
@@ -378,7 +378,7 @@ static void do_action_selectmenu_columnmenu(void *arg, int event)
else if (ELEM(event, ACTMENU_SEL_COLUMN_KEYS, ACTMENU_SEL_COLUMN_MARKERSCOLUMN)) {
if (key)
column_select_shapekeys(key, event);
- else
+ else if (act)
column_select_actionkeys(act, event);
}
else