blender
/
blender
137
410
Fork 592
Code Issues 6.3k Pull Requests 769 Projects 19 Wiki Activity

MIssed a flag in bli_strict_types.h

This commit is contained in:
Joseph Eagar 2021-05-23 21:34:20 -07:00
parent 5a26ea0961
commit 33066542ca
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/customdata.c
View File

@ -1504,14 +1504,14 @@ static bool layerValidate_propfloat2(void *data, const uint totitems, const bool
return has_errors;
}
void layerDynTopoVert_copy(const void *source, void *dest, int count)
static void layerDynTopoVert_copy(const void *source, void *dest, int count)
{
const MDynTopoVert *mv = (MDynTopoVert *)dest;
memcpy(dest, source, count * sizeof(MDynTopoVert));
}
void layerDynTopoVert_interp(
static void layerDynTopoVert_interp(
const void **sources, const float *weights, const float *sub_weights, int count, void *dest)
{
float co[3], no[3], origmask, color[4];

1
source/blender/blenlib/BLI_strict_flags.h
View File

@ -51,6 +51,7 @@
# pragma clang diagnostic error "-Wimplicit-float-conversion"
# pragma clang diagnostic error "-Wimplicit-int-conversion"
# pragma clang diagnostic error "-Wimplicit-int"
# pragma clang diagnostic error "-Wshadow"
# else
# pragma warning(error : 4018) /* signed/unsigned mismatch */
# pragma warning(error : 4244) /* conversion from 'type1' to 'type2', possible loss of data */

2
source/blender/bmesh/intern/bmesh_log.c
View File

@ -465,7 +465,7 @@ static void bm_log_faces_unmake(
BMLoop *ls[3] = {f->l_first, f->l_first->next, f->l_first->prev};
for (int i = 0; i < 3; i++) {
for (i = 0; i < 3; i++) {
if (lf->customdata[i]) {
CustomData_bmesh_copy_data(
&bm->ldata, &entry->ldata, ls[i]->head.data, &lf->customdata[i]);