diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
commit | df1c88b652e6977491b7f2b019c326518ccdc320 (patch) | |
tree | d3cfdaef8f3ea0744f5f666679dadc6425501711 /source/blender/windowmanager | |
parent | 2589f55a55bc9682111ab266bb89d8f08713f374 (diff) | |
parent | ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c index bc84d0b6748..153052d7e1c 100644 --- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c +++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c @@ -749,7 +749,7 @@ static bool wm_manipulatormap_select_all_intern( int i; bool changed = false; - wm_manipulatormap_select_array_ensure_len_alloc(mmap, BLI_ghash_size(hash)); + wm_manipulatormap_select_array_ensure_len_alloc(mmap, BLI_ghash_len(hash)); GHASH_ITER_INDEX (gh_iter, hash, i) { wmManipulator *mpr_iter = BLI_ghashIterator_getValue(&gh_iter); @@ -758,7 +758,7 @@ static bool wm_manipulatormap_select_all_intern( /* highlight first manipulator */ wm_manipulatormap_highlight_set(mmap, C, msel->items[0], msel->items[0]->highlight_part); - BLI_assert(BLI_ghash_size(hash) == msel->len); + BLI_assert(BLI_ghash_len(hash) == msel->len); BLI_ghash_free(hash, NULL, NULL); return changed; |