blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Sculpt-dev: attempt to fix warnings/error on linux

This commit is contained in:
Joseph Eagar 2021-12-11 12:26:19 -08:00
parent 6ccfeae9b1
commit cde09a4b24
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/BKE_brush_engine.h
View File

@ -176,7 +176,7 @@ typedef struct BrushTex {
MTex __mtex; // do not access directly. except for the actual evaluation code.
} BrushTex;
BrushTex *BKE_brush_tex_create();
BrushTex *BKE_brush_tex_create(void);
void BKE_brush_tex_free(BrushTex *btex);
void BKE_brush_tex_patch_channels(BrushTex *btex);
void BKE_brush_tex_from_mtex(BrushTex *btex, MTex *mtex);
@ -350,7 +350,7 @@ extern void BKE_brush_channelset_to_unified_settings(BrushChannelSet *chset,
void BKE_brush_init_toolsettings(struct Sculpt *sd);
void BKE_brush_builtin_create(struct Brush *brush, int tool);
BrushCommandList *BKE_brush_commandlist_create();
BrushCommandList *BKE_brush_commandlist_create(void);
void BKE_brush_commandlist_start(BrushCommandList *list,
struct Brush *brush,
BrushChannelSet *chset_final);
@ -411,8 +411,8 @@ void BKE_builtin_apply_hard_edge_mode(BrushChannelSet *chset, bool do_apply);
const char *BKE_brush_channel_category_get(BrushChannel *ch);
void BKE_brush_channel_category_set(BrushChannel *ch, const char *str);
void BKE_brush_channel_system_init();
void BKE_brush_channel_system_exit();
void BKE_brush_channel_system_init(void);
void BKE_brush_channel_system_exit(void);
/*
set up static type checker for BRUSHSET_XXX macros

2
source/blender/blenkernel/BKE_paint.h
View File

@ -923,7 +923,7 @@ void BKE_sculptsession_bm_to_me(struct Object *ob, bool reorder);
void BKE_sculptsession_bm_to_me_for_render(struct Object *object);
bool BKE_sculptsession_check_mdyntopo(SculptSession *ss, struct PBVH *pbvh, int totvert);
void BKE_sculptsession_sync_attributes(struct Object *ob, struct Mesh *me);
struct BMesh *BKE_sculptsession_empty_bmesh_create();
struct BMesh *BKE_sculptsession_empty_bmesh_create(void);
void BKE_sculptsession_bmesh_add_layers(struct Object *ob);
bool BKE_sculptsession_customlayer_get(struct Object *ob,
AttributeDomain domain,

5
source/blender/blenlib/BLI_mempool.h
View File

@ -45,11 +45,6 @@ BLI_mempool *BLI_mempool_create_ex(unsigned int esize,
//#define DEBUG_MEMPOOL_LEAKS
BLI_mempool *BLI_mempool_create(unsigned int esize,
unsigned int totelem,
unsigned int pchunk,
unsigned int flag);
#ifdef DEBUG_MEMPOOL_LEAKS
ATTR_MALLOC ATTR_WARN_UNUSED_RESULT ATTR_RETURNS_NONNULL;

2
source/blender/bmesh/intern/bmesh_polygon.h
View File

@ -254,7 +254,7 @@ void BM_face_splits_check_optimal(BMFace *f, BMLoop *(*loops)[2], int len) ATTR_
* faster alternative to:
* BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void **)v, 3);
*/
BLI_INLINE void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3]) ATTR_NONNULL()
BLI_INLINE void BM_face_as_array_vert_tri(BMFace *f, BMVert *r_verts[3])
{
BMLoop *l = BM_FACE_FIRST_LOOP(f);