Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 14 Feb 2018 20:49:13 +0000 (21:49 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 14 Feb 2018 20:49:13 +0000 (21:49 +0100)
1  2 
source/blender/gpu/GPU_material.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/nodes/shader/nodes/node_shader_particle_info.c
source/blender/render/extern/include/RE_shader_ext.h

Simple merge
Simple merge
index 24f0474a5b8dc3f5dde5f075e91ccca86407a484,3dbe5c81c570f126e461e1045dc5d33b8600b931..69fcbba8f884827b936de07510f5a13a625b5699
@@@ -45,13 -46,13 +46,13 @@@ static void node_shader_exec_particle_i
  {
        ShadeInput *shi = ((ShaderCallData *)data)->shi;
  
-       RE_instance_get_particle_info(shi->obi, out[0]->vec, out[1]->vec, out[2]->vec, out[3]->vec, out[4]->vec, out[5]->vec, out[6]->vec);
+       RE_instance_get_particle_info(shi->obi, out[0]->vec, out[1]->vec, out[2]->vec, out[3]->vec, out[4]->vec, out[5]->vec, out[6]->vec, out[7]->vec);
  }
  
 -static int gpu_shader_particle_info(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
 +static int gpu_shader_particle_info(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
  {
  
 -      return GPU_stack_link(mat, "particle_info", in, out,
 +      return GPU_stack_link(mat, node, "particle_info", in, out,
                              GPU_builtin(GPU_PARTICLE_SCALAR_PROPS),
                              GPU_builtin(GPU_PARTICLE_LOCATION),
                              GPU_builtin(GPU_PARTICLE_VELOCITY),