Commit: 7e577c485725405d7088832307ef99867f12d159 Author: YimingWu Date: Fri Nov 22 17:29:36 2019 +0800 Branches: temp-lanpr-review https://developer.blender.org/rB7e577c485725405d7088832307ef99867f12d159
Merge remote-tracking branch 'origin/master' into temp-lanpr-review =================================================================== =================================================================== diff --cc source/blender/blenloader/intern/readfile.c index 872d3ef0592,f6c1cd0380a..ef83bc2a65a --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@@ -74,8 -74,8 +74,9 @@@ #include "DNA_object_types.h" #include "DNA_packedFile_types.h" #include "DNA_particle_types.h" + #include "DNA_curveprofile_types.h" #include "DNA_lightprobe_types.h" +#include "DNA_lanpr_types.h" #include "DNA_rigidbody_types.h" #include "DNA_text_types.h" #include "DNA_view3d_types.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
