Commit: a814294044ca369d912a83e6ce094d222a60ceef Author: Campbell Barton Date: Fri Apr 7 14:38:23 2017 +1000 Branches: custom-manipulators https://developer.blender.org/rBa814294044ca369d912a83e6ce094d222a60ceef
Merge branch 'blender2.8' into custom-manipulators =================================================================== =================================================================== diff --cc source/blender/blenloader/intern/readfile.c index 3a8b2c749cc,08f2c56e0ad..05ae43225c4 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@@ -121,9 -121,7 +121,8 @@@ #include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_curve.h" - #include "BKE_depsgraph.h" #include "BKE_effect.h" +#include "BKE_facemap.h" #include "BKE_fcurve.h" #include "BKE_global.h" // for G #include "BKE_group.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
