[Bf-blender-cvs] [e6386ed286f] blender2.8: Merge branch 'master' into blender2.8

[Brecht Van Lommel]

Commit: e6386ed286f2e0d7a68772a24e7979b45c1c5ad7
Author: Brecht Van Lommel
Date:   Wed Feb 14 21:49:13 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBe6386ed286f2e0d7a68772a24e7979b45c1c5ad7

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/nodes/shader/nodes/node_shader_particle_info.c
index 24f0474a5b8,3dbe5c81c57..69fcbba8f88
--- a/source/blender/nodes/shader/nodes/node_shader_particle_info.c
+++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.c
@@@ -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),