[Bf-blender-cvs] [966c4eedc4d] sculpt-dev: fix compiler error
Joseph Eagar
noreply at git.blender.org
Thu Sep 30 11:01:48 CEST 2021
Commit: 966c4eedc4db802501db422285609e085aeab8cd
Author: Joseph Eagar
Date: Thu Sep 30 02:01:36 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB966c4eedc4db802501db422285609e085aeab8cd
fix compiler error
===================================================================
M source/blender/blenkernel/BKE_brush_engine.h
M source/blender/blenkernel/intern/brush_engine.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_brush_engine.h b/source/blender/blenkernel/BKE_brush_engine.h
index 6160bcf8137..745b7d7bfcd 100644
--- a/source/blender/blenkernel/BKE_brush_engine.h
+++ b/source/blender/blenkernel/BKE_brush_engine.h
@@ -357,7 +357,7 @@ void BKE_brush_channelset_ui_init(struct Brush *brush, int tool);
void BKE_brush_channelset_check_radius(BrushChannelSet *chset);
const char *BKE_brush_channel_category_get(BrushChannel *ch);
-const char *BKE_brush_channel_category_set(BrushChannel *ch, const char *str);
+void BKE_brush_channel_category_set(BrushChannel *ch, const char *str);
/*
set up static type checker for BRUSHSET_XXX macros
diff --git a/source/blender/blenkernel/intern/brush_engine.c b/source/blender/blenkernel/intern/brush_engine.c
index 6bc201c14f3..cf4271c24d6 100644
--- a/source/blender/blenkernel/intern/brush_engine.c
+++ b/source/blender/blenkernel/intern/brush_engine.c
@@ -1848,7 +1848,7 @@ const char *BKE_brush_channel_category_get(BrushChannel *ch)
return ch->category ? ch->category : ch->def->category;
}
-const char *BKE_brush_channel_category_set(BrushChannel *ch, const char *str)
+void BKE_brush_channel_category_set(BrushChannel *ch, const char *str)
{
MEM_SAFE_FREE(ch->category);
More information about the Bf-blender-cvs
mailing list