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

Antonio Vazquez noreply at git.blender.org
Thu Jun 22 11:24:19 CEST 2017


Commit: 71b4834adf8dc20e06d0532dcb0c28d7842ab7b7
Author: Antonio Vazquez
Date:   Thu Jun 22 11:19:00 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB71b4834adf8dc20e06d0532dcb0c28d7842ab7b7

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index acc3991b19d,664f1e07f71..c0ff2c24a58
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -51,14 -50,11 +51,15 @@@
  #include "BKE_main.h"
  #include "BKE_mesh.h"
  #include "BKE_node.h"
+ #include "BKE_report.h"
  #include "BKE_scene.h"
  #include "BKE_workspace.h"
 +#include "BKE_gpencil.h"
 +#include "BKE_paint.h"
 +#include "BKE_object.h"
  
  #include "BLI_listbase.h"
 +#include "BLI_math.h"
  #include "BLI_mempool.h"
  #include "BLI_string.h"
  #include "BLI_utildefines.h"




More information about the Bf-blender-cvs mailing list