Commit: dae8db68e9ba8774d56c26a5fac2e6a7378b1207 Author: Nathan Craddock Date: Wed Aug 7 18:45:55 2019 -0600 Branches: soc-2019-outliner https://developer.blender.org/rBdae8db68e9ba8774d56c26a5fac2e6a7378b1207
Merge branch 'master' into soc-2019-outliner =================================================================== =================================================================== diff --cc source/blender/editors/space_view3d/view3d_select.c index d0145dd51aa,d20a854c022..d874216dd91 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@@ -88,9 -88,7 +88,8 @@@ #include "ED_particle.h" #include "ED_mesh.h" #include "ED_object.h" +#include "ED_outliner.h" #include "ED_screen.h" - #include "ED_select_buffer_utils.h" #include "ED_select_utils.h" #include "ED_sculpt.h" #include "ED_mball.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
