[Bf-blender-cvs] [4d2810cfdd9] soc-2019-bevel-profiles: Merge branch 'master' into soc-2020-bevel-profiles

Hans Goudey noreply at git.blender.org
Sat Oct 5 16:42:28 CEST 2019


Commit: 4d2810cfdd9387792b95432bd466f4f917a71210
Author: Hans Goudey
Date:   Fri Oct 4 20:16:31 2019 -0400
Branches: soc-2019-bevel-profiles
https://developer.blender.org/rB4d2810cfdd9387792b95432bd466f4f917a71210

Merge branch 'master' into soc-2020-bevel-profiles

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



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

diff --cc source/blender/blenloader/intern/versioning_defaults.c
index 9955801754d,c9fb8b6990b..75fcd52c4e5
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@@ -46,9 -47,9 +47,10 @@@
  #include "BKE_library.h"
  #include "BKE_main.h"
  #include "BKE_node.h"
+ #include "BKE_paint.h"
  #include "BKE_screen.h"
  #include "BKE_workspace.h"
 +#include "BKE_profile_widget.h"
  
  #include "BLO_readfile.h"



More information about the Bf-blender-cvs mailing list