Commit: 71dc55e3bbcbecde070e23f798c153d7da03510e Author: Antonio Vazquez Date: Fri Jun 8 18:02:51 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rB71dc55e3bbcbecde070e23f798c153d7da03510e
Fix errors after merge =================================================================== M source/blender/editors/gpencil/gpencil_paint.c M source/blender/editors/space_view3d/view3d_ruler.c =================================================================== diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index ae5a4f40d25..b6ec2145895 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -46,7 +46,6 @@ #include "PIL_time.h" -#include "BKE_colortools.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -55,10 +54,10 @@ #include "DNA_brush_types.h" #include "DNA_windowmanager_types.h" +#include "BKE_colortools.h" #include "BKE_main.h" #include "BKE_brush.h" #include "BKE_paint.h" -#include "BKE_gpencil.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_gpencil.h" diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index 0622184b025..fa5fb0acc9f 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -42,6 +42,7 @@ #include "BKE_context.h" #include "BKE_gpencil.h" #include "BKE_main.h" +#include "BKE_material.h" #include "BKE_unit.h" #include "BIF_gl.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
