griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix BKE_deform.h compilation error on windows

Browse Source 
The issue was that the pure c++ functions were defined within a `extern C` block.

Pull Request: https://projects.blender.org/blender/blender/pulls/112947
This commit is contained in:
Falk David
2023-09-27 12:11:32 +02:00
committed by Falk David
parent 1cb3b83d33
commit 00d4b5562b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/BKE_deform.h
View File

@@ -295,13 +295,6 @@ void BKE_defvert_extract_vgroup_to_faceweights(const struct MDeformVert *dvert,
blender::OffsetIndices<int> faces,
bool invert_vgroup,
float *r_weights);
namespace blender::bke {
VArray<float> varray_for_deform_verts(Span<MDeformVert> dverts, int defgroup_index);
VMutableArray<float> varray_for_mutable_deform_verts(MutableSpan<MDeformVert> dverts,
int defgroup_index);
void remove_defgroup_index(MutableSpan<MDeformVert> dverts, int defgroup_index);
} // namespace blender::bke
#endif
void BKE_defvert_weight_to_rgb(float r_rgb[3], float weight);
@@ -317,3 +310,12 @@ void BKE_defbase_blend_write(struct BlendWriter *writer, const ListBase *defbase
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
namespace blender::bke {
VArray<float> varray_for_deform_verts(Span<MDeformVert> dverts, int defgroup_index);
VMutableArray<float> varray_for_mutable_deform_verts(MutableSpan<MDeformVert> dverts,
int defgroup_index);
void remove_defgroup_index(MutableSpan<MDeformVert> dverts, int defgroup_index);
} // namespace blender::bke
#endif