[Bf-blender-cvs] [7eb1dd08baa] sculpt-dev: Sculpt-dev: fix improper forward declaration
Joseph Eagar
noreply at git.blender.org
Wed Jan 26 01:27:25 CET 2022
Commit: 7eb1dd08baa34c022329c678bf7d8925040cfd2c
Author: Joseph Eagar
Date: Tue Jan 25 16:27:09 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rB7eb1dd08baa34c022329c678bf7d8925040cfd2c
Sculpt-dev: fix improper forward declaration
===================================================================
M source/blender/blenkernel/BKE_brush_engine.hh
M source/blender/editors/sculpt_paint/sculpt_brush_types.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_brush_engine.hh b/source/blender/blenkernel/BKE_brush_engine.hh
index f85286c6b62..42883d506ef 100644
--- a/source/blender/blenkernel/BKE_brush_engine.hh
+++ b/source/blender/blenkernel/BKE_brush_engine.hh
@@ -48,7 +48,7 @@
curve ? (BKE_curvemapping_cache_release_or_free(brush_curve_cache, curve), nullptr) : nullptr
#define CURVE_ADDREF(curve) BKE_curvemapping_cache_aquire(brush_curve_cache, curve)
-struct CurveMappingCache *brush_curve_cache = NULL;
+extern struct CurveMappingCache *brush_curve_cache;
extern BrushChannelType brush_builtin_channels[];
extern int brush_builtin_channel_len;
diff --git a/source/blender/editors/sculpt_paint/sculpt_brush_types.c b/source/blender/editors/sculpt_paint/sculpt_brush_types.c
index d8d6efd86f7..ed85a8b56cc 100644
--- a/source/blender/editors/sculpt_paint/sculpt_brush_types.c
+++ b/source/blender/editors/sculpt_paint/sculpt_brush_types.c
@@ -4290,7 +4290,7 @@ static void do_displacement_heal_cb(void *__restrict userdata,
copy_m3_m3(mats[locali], mat);
invert_m3(mat);
-
+
float disp[3];
copy_v3_v3(disp, SCULPT_vertex_co_get(ss, vertex));
sub_v3_v3(disp, p);
More information about the Bf-blender-cvs
mailing list