[Bf-blender-cvs] [73b8ea5f2b9] greasepencil-object: GPencil: Fix Sort function

Antonio Vazquez noreply at git.blender.org
Mon Nov 18 10:40:10 CET 2019


Commit: 73b8ea5f2b9b702d2b2340029615811d832b633a
Author: Antonio Vazquez
Date:   Mon Nov 18 10:40:05 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB73b8ea5f2b9b702d2b2340029615811d832b633a

GPencil: Fix Sort function

===================================================================

M	source/blender/blenkernel/intern/paint.c

===================================================================

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index a6ff693eaa1..135dd2f61d4 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -651,8 +651,8 @@ bool BKE_palette_is_empty(const struct Palette *palette)
 static int palettecolor_compare_hsv(const void *a1, const void *a2)
 {
   const tPaletteColorHSV *ps1 = a1, *ps2 = a2;
-  uint a = hsv_to_cpack(ps1->h, ps1->s, ps1->v);
-  uint b = hsv_to_cpack(ps2->h, ps2->s, ps2->v);
+  double a = (ps1->h * 1e11) + (ps1->s * 1e7) + (ps1->v * 1e3);
+  double b = (ps2->h * 1e11) + (ps2->s * 1e7) + (ps2->v * 1e3);
 
   if (a < b) {
     return -1;



More information about the Bf-blender-cvs mailing list