Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix memory leak when using two bump maps on the same material

Browse Source
This commit is contained in:
Antony Riakiotakis
2015-03-10 15:26:55 +01:00
parent 51a60cbaf8
commit edc8a4c484
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/intern/gpu_material.c
View File

@@ -1234,7 +1234,6 @@ static void do_material_tex(GPUShadeInput *shi)
float imag_tspace_dimension_x = 1024.0f; // only used for texture space variant float imag_tspace_dimension_x = 1024.0f; // only used for texture space variant
float aspect = 1.0f; float aspect = 1.0f;
GPUNodeLink *surf_pos = GPU_builtin(GPU_VIEW_POSITION);
GPUNodeLink *vR1, *vR2; GPUNodeLink *vR1, *vR2;
GPUNodeLink *dBs, *dBt, *fDet; GPUNodeLink *dBs, *dBt, *fDet;
@@ -1291,7 +1290,8 @@ static void do_material_tex(GPUShadeInput *shi)
// re-initialize if bump space changed // re-initialize if bump space changed
if ( iBumpSpacePrev != iBumpSpace ) { if ( iBumpSpacePrev != iBumpSpace ) {
GPUNodeLink *surf_pos = GPU_builtin(GPU_VIEW_POSITION);
if ( mtex->texflag & MTEX_BUMP_OBJECTSPACE ) if ( mtex->texflag & MTEX_BUMP_OBJECTSPACE )
GPU_link(mat, "mtex_bump_init_objspace", GPU_link(mat, "mtex_bump_init_objspace",
surf_pos, vNorg, surf_pos, vNorg,