diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
| commit | f35e9f047a0381732a41ec331945b7a0654ee578 (patch) | |
| tree | 5be3c632483cf2bc2960b21789849af27c9b2b59 /source/blender/draw/engines | |
| parent | 0ad183bf0289c3b9b1af0cd581bc30435cae3800 (diff) | |
| parent | bb3ec3ebafbc2c0e5d8530148a433242e0adad30 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw/engines')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_deferred.c | 4 | ||||
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_forward.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c index 56c2394a731..1085476828f 100644 --- a/source/blender/draw/engines/workbench/workbench_deferred.c +++ b/source/blender/draw/engines/workbench/workbench_deferred.c @@ -616,7 +616,7 @@ static WORKBENCH_MaterialData *get_or_create_material_data( material_template.ima = ima; uint hash = workbench_material_get_hash(&material_template, is_ghost); - material = BLI_ghash_lookup(wpd->material_hash, SET_UINT_IN_POINTER(hash)); + material = BLI_ghash_lookup(wpd->material_hash, POINTER_FROM_UINT(hash)); if (material == NULL) { material = MEM_mallocN(sizeof(WORKBENCH_MaterialData), __func__); material->shgrp = DRW_shgroup_create( @@ -627,7 +627,7 @@ static WORKBENCH_MaterialData *get_or_create_material_data( DRW_shgroup_uniform_int(material->shgrp, "object_id", &material->object_id, 1); workbench_material_shgroup_uniform(wpd, material->shgrp, material, ob); - BLI_ghash_insert(wpd->material_hash, SET_UINT_IN_POINTER(hash), material); + BLI_ghash_insert(wpd->material_hash, POINTER_FROM_UINT(hash), material); } return material; } diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index 410c693689f..39e5e10ca8f 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -155,7 +155,7 @@ static WORKBENCH_MaterialData *get_or_create_material_data( material_template.ima = ima; uint hash = workbench_material_get_hash(&material_template, false); - material = BLI_ghash_lookup(wpd->material_hash, SET_UINT_IN_POINTER(hash)); + material = BLI_ghash_lookup(wpd->material_hash, POINTER_FROM_UINT(hash)); if (material == NULL) { material = MEM_mallocN(sizeof(WORKBENCH_MaterialData), __func__); @@ -192,7 +192,7 @@ static WORKBENCH_MaterialData *get_or_create_material_data( } material->object_id = engine_object_data->object_id; DRW_shgroup_uniform_int(material->shgrp_object_outline, "object_id", &material->object_id, 1); - BLI_ghash_insert(wpd->material_hash, SET_UINT_IN_POINTER(hash), material); + BLI_ghash_insert(wpd->material_hash, POINTER_FROM_UINT(hash), material); } return material; } |