blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

GPencil: Fix MSVC warning in lineart_cpp_bridge.cc 

MSVC give a rather large warning when using blender::parallel_sort
without using a lambda for the comparison.

Fixed by using a lambda
This commit is contained in:
Ray molenkamp 2022-10-27 09:16:51 -06:00
parent 2625c39ce7
commit c967bdcbb1
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/gpencil_modifiers/intern/lineart/lineart_cpp_bridge.cc
View File

@ -9,17 +9,15 @@
#include "MOD_lineart.h"
#include "lineart_intern.h"
static bool cmp_adjacent_items(const LineartAdjacentEdge &p1, const LineartAdjacentEdge &p2)
{
int a = p1.v1 - p2.v1;
int b = p1.v2 - p2.v2;
/* parallel_sort() requires cmp() to return true when the first element needs to appear before
* the second element in the sorted array, false otherwise (strict weak ordering), see
* https://en.cppreference.com/w/cpp/named_req/Compare. */
return a < 0 ? true : (a == 0 ? b < 0 : false);
}
void lineart_sort_adjacent_items(LineartAdjacentEdge *ai, int length)
{
blender::parallel_sort(ai, ai + length, cmp_adjacent_items);
blender::parallel_sort(
ai, ai + length, [](const LineartAdjacentEdge &p1, const LineartAdjacentEdge &p2) {
int a = p1.v1 - p2.v1;
int b = p1.v2 - p2.v2;
/* parallel_sort() requires cmp() to return true when the first element needs to appear
* before the second element in the sorted array, false otherwise (strict weak ordering),
* see https://en.cppreference.com/w/cpp/named_req/Compare. */
return a < 0 ? true : (a == 0 ? b < 0 : false);
});
}