Commit: a218c623ad071c69895de36e256b670f5eaae7d5 Author: Brecht Van Lommel Date: Fri Sep 10 17:41:24 2021 +0200 Branches: cycles-x https://developer.blender.org/rBa218c623ad071c69895de36e256b670f5eaae7d5
Merge branch 'master' into cycles-x =================================================================== =================================================================== diff --cc source/blender/blenloader/intern/versioning_defaults.c index 33ec63b5eb5,ae0dbb7f808..d599a79f01a --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@@ -52,8 -52,8 +52,9 @@@ #include "BKE_brush.h" #include "BKE_colortools.h" #include "BKE_curveprofile.h" + #include "BKE_customdata.h" #include "BKE_gpencil.h" +#include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
