[Bf-blender-cvs] [7d294eade0d] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Thu May 31 13:30:06 CEST 2018


Commit: 7d294eade0dd4d4b3d9dce11ea45837294821ecb
Author: Antonio Vazquez
Date:   Thu May 31 13:29:57 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7d294eade0dd4d4b3d9dce11ea45837294821ecb

Merge branch 'blender2.8' into greasepencil-object

===================================================================



===================================================================

diff --cc source/blender/editors/space_view3d/view3d_edit.c
index 2bc7baaffe0,f37f446ad3e..9c248f84055
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@@ -52,9 -52,9 +52,10 @@@
  #include "BKE_camera.h"
  #include "BKE_context.h"
  #include "BKE_font.h"
 +#include "BKE_gpencil.h"
  #include "BKE_layer.h"
  #include "BKE_library.h"
+ #include "BKE_main.h"
  #include "BKE_object.h"
  #include "BKE_paint.h"
  #include "BKE_report.h"



More information about the Bf-blender-cvs mailing list