diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 10:29:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 10:29:30 +0300 |
| commit | 9536f920e375cddbb83e55c53e50a3b8cab54ce6 (patch) | |
| tree | 5844fecb91ee828b6a74a3cc951aef4d4e074a22 /source/blender/draw/engines/workbench/workbench_materials.c | |
| parent | 96bae0f882034a1e0496261df2c3254d1ca13083 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_materials.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_materials.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index 6755bf82ecd..54e8aa1c3b3 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -129,8 +129,7 @@ uint workbench_material_get_hash(WORKBENCH_MaterialData *material_template) result += BLI_ghashutil_uinthash_v4_murmur(input); /* add texture reference */ - if (material_template->ima) - { + if (material_template->ima) { result += BLI_ghashutil_inthash_p_murmur(material_template->ima); } @@ -182,10 +181,10 @@ int workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, Image *i return color_type; } -void workbench_material_shgroup_uniform(WORKBENCH_PrivateData *wpd, DRWShadingGroup *grp, WORKBENCH_MaterialData *material) +void workbench_material_shgroup_uniform( + WORKBENCH_PrivateData *wpd, DRWShadingGroup *grp, WORKBENCH_MaterialData *material) { - if (workbench_material_determine_color_type(wpd, material->ima) == V3D_SHADING_TEXTURE_COLOR) - { + if (workbench_material_determine_color_type(wpd, material->ima) == V3D_SHADING_TEXTURE_COLOR) { GPUTexture *tex = GPU_texture_from_blender(material->ima, NULL, GL_TEXTURE_2D, false, 0.0f); DRW_shgroup_uniform_texture(grp, "image", tex); } |