Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +5 -5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c2071da085 - Show all commits

3
source/blender/blenkernel/intern/crazyspace.cc
View File

@ -596,8 +596,7 @@ void BKE_crazyspace_api_eval_clear(Object *object)
namespace blender::bke::crazyspace { namespace blender::bke::crazyspace {
GeometryDeformation get_evaluated_curves_deformation(const Object *ob_eval, GeometryDeformation get_evaluated_curves_deformation(const Object *ob_eval, const Object &ob_orig)
const Object &ob_orig)
{ {
BLI_assert(ob_orig.type == OB_CURVES); BLI_assert(ob_orig.type == OB_CURVES);
const Curves &curves_id_orig = *static_cast<const Curves *>(ob_orig.data); const Curves &curves_id_orig = *static_cast<const Curves *>(ob_orig.data);

2
source/blender/editors/mesh/editmesh_bisect.c
View File

@ -54,7 +54,7 @@ typedef struct {
BMBackup mesh_backup; BMBackup mesh_backup;
bool is_valid; bool is_valid;
bool is_dirty; bool is_dirty;
} *backup; } * backup;
int backup_len; int backup_len;
} BisectData; } BisectData;

4
source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
View File

@ -12,9 +12,9 @@
#include "BLI_linklist.h" #include "BLI_linklist.h"
#include "BLI_listbase.h" #include "BLI_listbase.h"
#include "BLI_math.h" #include "BLI_math.h"
#include "BLI_sort.hh"
#include "BLI_task.h" #include "BLI_task.h"
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "BLI_sort.hh"
#include "BLI_vector.hh" #include "BLI_vector.hh"
#include "PIL_time.h" #include "PIL_time.h"
@ -1889,7 +1889,7 @@ static void lineart_edge_neighbor_init_task(void *__restrict userdata,
edge_nabr->flags = 0; edge_nabr->flags = 0;
} }
void lineart_sort_adjacent_items(LineartAdjacentEdge *ai, int length) static void lineart_sort_adjacent_items(LineartAdjacentEdge *ai, int length)
{ {
blender::parallel_sort( blender::parallel_sort(
ai, ai + length, [](const LineartAdjacentEdge &p1, const LineartAdjacentEdge &p2) { ai, ai + length, [](const LineartAdjacentEdge &p1, const LineartAdjacentEdge &p2) {

1
tests/python/bl_usd_export_test.py
View File

@ -14,6 +14,7 @@ import bpy
args = None args = None
class AbstractUSDTest(unittest.TestCase): class AbstractUSDTest(unittest.TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):