Commit: 6702da509acd758b4e2841f296b739d3864b2c71 Author: YimingWu Date: Sat Jul 6 10:03:47 2019 +0800 Branches: soc-2019-npr https://developer.blender.org/rB6702da509acd758b4e2841f296b739d3864b2c71
Merge remote-tracking branch 'origin/master' into soc-2019-npr # Conflicts: # source/blender/draw/intern/draw_manager.c =================================================================== =================================================================== diff --cc source/blender/draw/intern/draw_manager.c index 6de9781676c,2a241264988..79153b03509 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@@ -88,7 -88,7 +88,8 @@@ #include "engines/basic/basic_engine.h" #include "engines/workbench/workbench_engine.h" #include "engines/external/external_engine.h" +#include "engines/lanpr/lanpr_all.h" + #include "engines/gpencil/gpencil_engine.h" #include "GPU_context.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
