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:
authorCampbell Barton <ideasman42@gmail.com>2021-01-19 12:43:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-19 12:43:49 +0300
commit089cd25982b41e9ab72642dada59074d08fb0bdf (patch)
tree25e4ccdaacbe55a59a6d0b4e7c588ffd3af34d8c /source/blender/editors/space_clip
parentdf2ed1550d69fc05892b9f5d392ff188e46504cd (diff)
parenta86bb2594f1e417041a849c42252125d0ff1b491 (diff)
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/space_clip.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index 6b514935863..d4391fc3ff4 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -885,7 +885,8 @@ static void clip_main_region_init(wmWindowManager *wm, ARegion *region)
{
wmKeyMap *keymap;
- UI_view2d_region_reinit(&region->v2d, V2D_COMMONVIEW_STANDARD, region->winx, region->winy);
+ /* NOTE: don't use `UI_view2d_region_reinit(&region->v2d, ...)`
+ * since the space clip manages own v2d in #movieclip_main_area_set_view2d */
/* mask polls mode */
keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0);