blender
/
blender
130
397
Fork 571
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix snap in 2.8 after poor merge from master 

If you merge from master to blender2.8 after a commit, remember to test in 2.8, otherwise what is the point?
Specially if it's a non-essential commit such as c9817c67fc.

Bug introduced on: f4155d3778 (the merge
that included the above commit).
This commit is contained in:
Dalai Felinto 2017-07-14 14:42:15 +02:00
parent 9d318acfa7
commit 4467efe971
Notes: blender-bot 2023-02-14 06:48:39 +01:00 
Referenced by issue #52057, Snapping Element holding Control Crashes Blender
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/transform/transform_snap_object.c
View File

@ -153,7 +153,7 @@ struct SnapObjectContext {
obmat = ob->obmat;\
CODE\
}\
for (Base *base = sctx->scene->base.first; base != NULL; base = base->next) {\
for (Base *base = sctx->scene_layer->object_bases.first; base != NULL; base = base->next) {\
if ((BASE_VISIBLE_NEW(base)) && (base->flag_legacy & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 &&\
!((snap_select == SNAP_NOT_SELECTED && ((base->flag & BASE_SELECTED) || (base->flag_legacy & BA_WAS_SEL))) ||\
(snap_select == SNAP_NOT_ACTIVE && base == base_act)))\