archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-09-19 12:14:36 +10:00
parent 0ad183bf02 bb3ec3ebaf
commit f35e9f047a
82 changed files with 410 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -516,14 +516,14 @@ static void codegen_set_texid(GHash *bindhash, GPUInput *input, int *texid, void
{
if (BLI_ghash_haskey(bindhash, key)) {
/* Reuse existing texid */
input->texid = GET_INT_FROM_POINTER(BLI_ghash_lookup(bindhash, key));
input->texid = POINTER_AS_INT(BLI_ghash_lookup(bindhash, key));
}
else {
/* Allocate new texid */
input->texid = *texid;
(*texid)++;
input->bindtex = true;
BLI_ghash_insert(bindhash, key, SET_INT_IN_POINTER(input->texid));
BLI_ghash_insert(bindhash, key, POINTER_FROM_INT(input->texid));
}
}