Commit: 4467efe971643d1e9a595617dd5f0cea6b54a170
Author: Dalai Felinto
Date: Fri Jul 14 14:42:15 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB4467efe971643d1e9a595617dd5f0cea6b54a170
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 c9817c67fc141ca85a6e1f9e42d9fa.
Bug introduced on: f4155d3778ba883566eeb87d16218c4c275ffc (the merge
that included the above commit).
===================================================================
M source/blender/editors/transform/transform_snap_object.c
===================================================================
diff --git a/source/blender/editors/transform/transform_snap_object.c
b/source/blender/editors/transform/transform_snap_object.c
index 0d63bae93e9..8dd09ce25ea 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -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)))\
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
