diff options
Diffstat (limited to 'source/blender/draw/engines/gpencil/gpencil_cache_utils.c')
-rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_cache_utils.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c index 8a4134ec8ea..363794e1be3 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c @@ -132,12 +132,11 @@ static int gpencil_tobject_dist_sort(const void *a, const void *b) if (ob_a->camera_z > ob_b->camera_z) { return 1; } - else if (ob_a->camera_z < ob_b->camera_z) { + if (ob_a->camera_z < ob_b->camera_z) { return -1; } - else { - return 0; - } + + return 0; } void gpencil_object_cache_sort(GPENCIL_PrivateData *pd) @@ -193,7 +192,7 @@ static float gpencil_layer_final_opacity_get(const GPENCIL_PrivateData *pd, if (is_obact && is_fade) { return gpl->opacity * pd->fade_layer_opacity; } - else if (!is_obact && (pd->fade_gp_object_opacity > -1.0f)) { + if (!is_obact && (pd->fade_gp_object_opacity > -1.0f)) { return gpl->opacity * pd->fade_gp_object_opacity; } } @@ -246,7 +245,7 @@ static void gpencil_layer_random_color_get(const Object *ob, uint ob_hash = BLI_ghashutil_strhash_p_murmur(ob->id.name); uint gpl_hash = BLI_ghashutil_strhash_p_murmur(gpl->info); float hue = BLI_hash_int_01(ob_hash * gpl_hash); - float hsv[3] = {hue, hsv_saturation, hsv_value}; + const float hsv[3] = {hue, hsv_saturation, hsv_value}; hsv_to_rgb_v(hsv, r_color); } |