[Bf-blender-cvs] [5e469bb] asset-engine: Merge branch 'master' into asset-engine

Bastien Montagne noreply at git.blender.org
Sun Jul 24 18:13:44 CEST 2016


Commit: 5e469bbd9549cbe2dd280d73f605b5a98a008db1
Author: Bastien Montagne
Date:   Sat Jul 16 15:39:50 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB5e469bbd9549cbe2dd280d73f605b5a98a008db1

Merge branch 'master' into asset-engine

Conflicts:
	source/blender/windowmanager/intern/wm_init_exit.c

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



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

diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 91322c8,3022d86..c96d019
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -40,9 -40,7 +40,10 @@@
  
  #include "MEM_guardedalloc.h"
  
 +#include "RNA_define.h"
 +#include "RNA_types.h"
 +
+ #include "DNA_genfile.h"
  #include "DNA_scene_types.h"
  #include "DNA_userdef_types.h"
  #include "DNA_windowmanager_types.h"




More information about the Bf-blender-cvs mailing list