Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 21 Jun 2017 13:14:42 +0000 (15:14 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 21 Jun 2017 13:14:42 +0000 (15:14 +0200)
12 files changed:
1  2 
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_layout.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_fluidsim.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_ocean.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/modifiers/intern/MOD_uvproject.c
tests/python/CMakeLists.txt
tests/python/bl_alembic_import_test.py

Simple merge
index 2497e0b9aab06a94c78f2adde18f7b4db2f7ecaa,83a4250418020b69be29d852d2d6ea2cca63234e..b1fe353515445b9f4d679a01f313510c943c6774
@@@ -36,7 -36,7 +36,8 @@@
  
  #include "BKE_cdderivedmesh.h"
  #include "BKE_dynamicpaint.h"
 +#include "BKE_layer.h"
+ #include "BKE_library.h"
  #include "BKE_library_query.h"
  #include "BKE_modifier.h"
  
index 362df031f9243fd4ee49c14728c22e8c6d0a25a3,01468c1143a951b201b0aac29f3aa57f23b749cb..cae83282238aeb17e2a30dfe2bc00284d07f77cb
@@@ -45,8 -45,8 +45,9 @@@
  
  
  #include "BKE_camera.h"
+ #include "BKE_library.h"
  #include "BKE_library_query.h"
 +#include "BKE_material.h"
  #include "BKE_mesh.h"
  #include "BKE_DerivedMesh.h"
  
Simple merge