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

[Campbell Barton]

Commit: 251349c3c2269fff915d1bb85911211563493071
Author: Campbell Barton
Date:   Thu Jul 28 12:00:58 2016 +1000
Branches: blender2.8
https://developer.blender.org/rB251349c3c2269fff915d1bb85911211563493071

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/gpu/intern/gpu_material.c
index 00af199,ed9718f..60df9e8
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@@ -255,8 -260,19 +255,11 @@@ static int GPU_material_construct_end(G
  			material->obautobumpscaleloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_AUTO_BUMPSCALE));
  		if (material->builtins & GPU_CAMERA_TEXCO_FACTORS)
  			material->cameratexcofacloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_CAMERA_TEXCO_FACTORS));
 -		if (material->builtins & GPU_PARTICLE_SCALAR_PROPS)
 -			material->partscalarpropsloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_PARTICLE_SCALAR_PROPS));
 -		if (material->builtins & GPU_PARTICLE_LOCATION)
 -			material->partcoloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_PARTICLE_LOCATION));
 -		if (material->builtins & GPU_PARTICLE_VELOCITY)
 -			material->partvel = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_PARTICLE_VELOCITY));
 -		if (material->builtins & GPU_PARTICLE_ANG_VELOCITY)
 -			material->partangvel = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_PARTICLE_ANG_VELOCITY));
  		return 1;
  	}
+ 	else {
+ 		GPU_pass_free_nodes(&material->nodes);
+ 	}
  
  	return 0;
  }