Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 14 Feb 2018 14:16:50 +0000 (15:16 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 14 Feb 2018 14:16:50 +0000 (15:16 +0100)
1  2 
CMakeLists.txt
intern/cycles/blender/blender_curves.cpp
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_child.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/nodes/shader/nodes/node_shader_particle_info.c

diff --cc CMakeLists.txt
Simple merge
index 279068c440ee26bdda40b84d5e8ba00bc598bba3,6ddc12e435bad8f9a62d67ad73feeacfdc27fa4a..3f6bb5b9954738b2f3d1e2efcb0c58a2bd20e784
@@@ -313,8 -298,10 +313,9 @@@ set(SR
        BKE_writeavi.h
        BKE_writeframeserver.h
  
 -      depsgraph_private.h
        nla_private.h
        tracking_private.h
+       particle_private.h
        intern/CCGSubSurf.h
        intern/CCGSubSurf_inline.h
        intern/CCGSubSurf_intern.h
index d227ea558165ee9b25f1d0f5f92d02b0cc3d8765,2b5c293932a70c29741d9f3a20dcc85da819c4bf..daab16959d1a4f481a4ba297a1a317508f974052
  #include "BKE_scene.h"
  #include "BKE_deform.h"
  
 +#include "DEG_depsgraph.h"
 +#include "DEG_depsgraph_build.h"
 +
  #include "RE_render_ext.h"
  
+ #include "particle_private.h"
  unsigned int PSYS_FRAND_SEED_OFFSET[PSYS_FRAND_COUNT];
  unsigned int PSYS_FRAND_SEED_MULTIPLIER[PSYS_FRAND_COUNT];
  float PSYS_FRAND_BASE[PSYS_FRAND_COUNT];
index e4f121d03deaec6b303fc3d435cba2a500653b51,d7e744951c483e94c3b6bf8f383e1c08be2ed6f1..ca569d68dee13a2d8e063577bf414a18c911dbc5
  
  #include <string.h>
  
 -#include "GPU_glew.h"
 -
  #include "BLI_blenlib.h"
+ #include "BLI_hash.h"
  #include "BLI_linklist.h"
  #include "BLI_math.h"
  #include "BLI_threads.h"