[Bf-blender-cvs] [26933c4700c] greasepencil-object: Merge branch 'master' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Thu Nov 14 12:39:21 CET 2019


Commit: 26933c4700ca00ecae9e9d6197128bc7d75322f3
Author: Antonio Vazquez
Date:   Thu Nov 14 12:38:21 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB26933c4700ca00ecae9e9d6197128bc7d75322f3

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenloader/intern/versioning_defaults.c

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



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

diff --cc source/blender/blenloader/intern/versioning_defaults.c
index 2f063e05cdf,45fb62a4ac0..0b2e9ed6fca
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@@ -47,7 -46,7 +47,8 @@@
  #include "BKE_layer.h"
  #include "BKE_library.h"
  #include "BKE_main.h"
+ #include "BKE_mesh.h"
 +#include "BKE_material.h"
  #include "BKE_node.h"
  #include "BKE_paint.h"
  #include "BKE_screen.h"



More information about the Bf-blender-cvs mailing list