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>2018-04-20 14:45:48 +0300
committerJoshua Leung <aligorith@gmail.com>2018-04-20 19:54:41 +0300
commit60e2c60be711a892459953b8788494fe869164e8 (patch)
tree84fbd69112c857e66bd34527993fe477d34c8c2d /source/blender/editors/space_action
parent6d0c59b0116a8575e82b71e61e7c577923f3d2b7 (diff)
Fix: Timeline's "Show Cache" options should not get reset on window size change
These were getting set in the init() callback instead of the new(). As a result, the settings would get reset everytime you resized the window/area - not quite something you'd really want happening everything the size changes!
Diffstat (limited to 'source/blender/editors/space_action')
-rw-r--r--source/blender/editors/space_action/space_action.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index 23e3751b358..82547d6f8bc 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -107,6 +107,12 @@ static SpaceLink *action_new(const bContext *C)
saction->ads.filterflag |= ADS_FILTER_SUMMARY;
+ /* enable all cache display */
+ saction->cache_display |= TIME_CACHE_DISPLAY;
+ saction->cache_display |= (TIME_CACHE_SOFTBODY | TIME_CACHE_PARTICLES);
+ saction->cache_display |= (TIME_CACHE_CLOTH | TIME_CACHE_SMOKE | TIME_CACHE_DYNAMICPAINT);
+ saction->cache_display |= TIME_CACHE_RIGIDBODY;
+
/* header */
ar = MEM_callocN(sizeof(ARegion), "header for action");
@@ -176,12 +182,6 @@ static void action_init(struct wmWindowManager *UNUSED(wm), ScrArea *sa)
SpaceAction *saction = sa->spacedata.first;
saction->flag |= SACTION_TEMP_NEEDCHANSYNC;
-
- /* enable all cache display */
- saction->cache_display |= TIME_CACHE_DISPLAY;
- saction->cache_display |= (TIME_CACHE_SOFTBODY | TIME_CACHE_PARTICLES);
- saction->cache_display |= (TIME_CACHE_CLOTH | TIME_CACHE_SMOKE | TIME_CACHE_DYNAMICPAINT);
- saction->cache_display |= TIME_CACHE_RIGIDBODY;
}
static SpaceLink *action_duplicate(SpaceLink *sl)