[Bf-blender-cvs] [5223f73a1d0] sculpt-dev: Fix compile error
Joseph Eagar
noreply at git.blender.org
Sat Sep 18 10:26:23 CEST 2021
Commit: 5223f73a1d0027452fcf8f9144a52025b3e6e58c
Author: Joseph Eagar
Date: Sat Sep 18 01:26:12 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB5223f73a1d0027452fcf8f9144a52025b3e6e58c
Fix compile error
===================================================================
M release/scripts/startup/bl_ui/properties_paint_common.py
M source/blender/editors/sculpt_paint/sculpt_smooth.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 8ae7bec51e9..3c5926e5972 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -976,7 +976,7 @@ def brush_shared_settings(layout, context, brush, popover=False):
# layout.prop(brush.channels.channels["STRENGTH"], "value", text="Strength")
# pass
#elif strength:
- if strength:
+ if strength:
pressure_name = "use_pressure_strength" if strength_pressure else None
UnifiedPaintPanel.prop_unified(
layout,
diff --git a/source/blender/editors/sculpt_paint/sculpt_smooth.c b/source/blender/editors/sculpt_paint/sculpt_smooth.c
index c4aec5f9dd0..68c551b5bfe 100644
--- a/source/blender/editors/sculpt_paint/sculpt_smooth.c
+++ b/source/blender/editors/sculpt_paint/sculpt_smooth.c
@@ -1676,8 +1676,9 @@ static void SCULPT_do_uniform_weigths_smooth_task_cb_ex(void *__restrict userdat
float co_accum[3] = {0.0f};
SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN (ss, vd.vertex, ni) {
- const float neighbor_co[3];
- const float neighbor_disp[3];
+ float neighbor_co[3];
+ float neighbor_disp[3];
+
sub_v3_v3v3(
neighbor_disp, SCULPT_vertex_co_get(ss, ni.vertex), SCULPT_vertex_co_get(ss, vd.vertex));
normalize_v3(neighbor_disp);
More information about the Bf-blender-cvs
mailing list