[Bf-blender-cvs] [e582a4dc771] sculpt-dev: Fix debug build
Pablo Dobarro
noreply at git.blender.org
Wed Dec 16 21:36:54 CET 2020
Commit: e582a4dc771201fb8a2b37f996d54f86807f6c76
Author: Pablo Dobarro
Date: Tue Dec 15 22:07:47 2020 +0100
Branches: sculpt-dev
https://developer.blender.org/rBe582a4dc771201fb8a2b37f996d54f86807f6c76
Fix debug build
===================================================================
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_transform.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 3f521d20646..af5e107f8d8 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3223,10 +3223,9 @@ static void do_fairing_brush_displace_task_cb_ex(void *__restrict userdata,
static void sculpt_fairing_brush_exec_fairing_for_cache(Sculpt *sd, Object *ob)
{
+ SculptSession *ss = ob->sculpt;
BLI_assert(BKE_pbvh_type(ss->pbvh) != PBVH_GRIDS);
BLI_assert(ss->cache);
-
- SculptSession *ss = ob->sculpt;
Brush *brush = BKE_paint_brush(&sd->paint);
Mesh *mesh = ob->data;
diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.c b/source/blender/editors/sculpt_paint/sculpt_transform.c
index 0c6f6123289..974eb93822a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_transform.c
+++ b/source/blender/editors/sculpt_paint/sculpt_transform.c
@@ -308,10 +308,9 @@ static void sculpt_elastic_transform_task_cb(void *__restrict userdata,
static void sculpt_transform_radius_elastic(Sculpt *sd, Object *ob, const float transform_radius)
{
+ SculptSession *ss = ob->sculpt;
BLI_assert(ss->filter_cache->transform_displacement_mode ==
SCULPT_TRANSFORM_DISPLACEMENT_INCREMENTAL);
-
- SculptSession *ss = ob->sculpt;
const char symm = SCULPT_mesh_symmetry_xyz_get(ob);
SculptThreadedTaskData data = {
More information about the Bf-blender-cvs
mailing list