Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-11 08:48:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-11 08:48:52 +0300
commit33f3298e28d8d16e870c7a6cb8ca0fef756335a2 (patch)
tree4786bbb15913e2651a4406305812e3b90b607fe1 /source/blender/draw/engines/workbench/workbench_studiolight.c
parentdf10a2e030583ff9b2210e74ac262ec05d0684ae (diff)
Cleanup: use 'uint' in draw manager
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_studiolight.c')
-rw-r--r--source/blender/draw/engines/workbench/workbench_studiolight.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_studiolight.c b/source/blender/draw/engines/workbench/workbench_studiolight.c
index 8de7eaa52ea..5b1d4432ca7 100644
--- a/source/blender/draw/engines/workbench/workbench_studiolight.c
+++ b/source/blender/draw/engines/workbench/workbench_studiolight.c
@@ -90,7 +90,7 @@ void studiolight_update_world(int studio_light, WORKBENCH_UBO_World *wd)
uint *WORKBENCH_generate_studiolight_preview(int studiolight_id, int icon_size)
{
- unsigned int *rect = MEM_mallocN(icon_size * icon_size * sizeof(unsigned int), __func__);
+ uint *rect = MEM_mallocN(icon_size * icon_size * sizeof(uint), __func__);
int icon_center = icon_size / 2;
float sphere_radius = icon_center * 0.9;
@@ -109,11 +109,11 @@ uint *WORKBENCH_generate_studiolight_preview(int studiolight_id, int icon_size)
}
}
}
- unsigned int pixelresult = 0x0;
- unsigned int alias_i = clamp_i(alias * 256, 0, 255);
+ uint pixelresult = 0x0;
+ uint alias_i = clamp_i(alias * 256, 0, 255);
if (alias_i != 0) {
/* calculate normal */
- unsigned int alias_mask = alias_i << 24;
+ uint alias_mask = alias_i << 24;
float normal[3];
normal[0] = dx / sphere_radius;
normal[1] = dy / sphere_radius;