Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jul 2016 02:00:58 +0000 (12:00 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jul 2016 02:00:58 +0000 (12:00 +1000)
13 files changed:
1  2 
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/texture.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_nodetree.c

index 00af1991eafbd84b5f91f5696692c8b5d7c41117,ed9718f1a17e420f1529cfd4048f411d462a2174..60df9e87cc097ab46a8c9c2b70dd013ee32e9de8
@@@ -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;
  }