Commit: 828cd5ba9d0c24ad08291acbef752dd97cac1970 Author: Antonio Vazquez Date: Fri Aug 13 10:38:18 2021 +0200 Branches: asset-greasepencil https://developer.blender.org/rB828cd5ba9d0c24ad08291acbef752dd97cac1970
Merge branch 'master' into asset-greasepencil =================================================================== =================================================================== diff --cc source/blender/editors/render/render_preview.c index 60cffc495c0,95351de45f0..314a220b351 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@@ -45,9 -45,9 +45,10 @@@ #include "DNA_brush_types.h" #include "DNA_camera_types.h" #include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" #include "DNA_light_types.h" #include "DNA_material_types.h" + #include "DNA_mesh_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
