Commit: 418da7b7102e0c2bd7513c67364fc1075db39102 Author: Julian Eisel Date: Sat Aug 15 14:13:07 2015 +0200 Branches: wiggly-widgets https://developer.blender.org/rB418da7b7102e0c2bd7513c67364fc1075db39102
Merge branch 'master' into wiggly-widgets =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/object.c index fdd3b9f,d965e83..47179e9 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@@ -85,9 -85,9 +85,10 @@@ #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_effect.h" +#include "BKE_facemap.h" #include "BKE_fcurve.h" #include "BKE_group.h" + #include "BKE_icons.h" #include "BKE_key.h" #include "BKE_lamp.h" #include "BKE_lattice.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
