Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +5 -1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5ab49afe8d - Show all commits

6
source/blender/modifiers/intern/MOD_skin.cc
View File

@ -236,6 +236,8 @@ static bool quad_crosses_symmetry_plane(BMVert *quad[4], const SkinModifierData
return false; return false;
} }
#ifdef WITH_BULLET
/* Returns true if the frame is filled by precisely two faces (and /* Returns true if the frame is filled by precisely two faces (and
* outputs those faces to fill_faces), otherwise returns false. */ * outputs those faces to fill_faces), otherwise returns false. */
static bool skin_frame_find_contained_faces(const Frame *frame, BMFace *fill_faces[2]) static bool skin_frame_find_contained_faces(const Frame *frame, BMFace *fill_faces[2])
@ -255,6 +257,8 @@ static bool skin_frame_find_contained_faces(const Frame *frame, BMFace *fill_fac
return false; return false;
} }
#endif
/* Returns true if hull is successfully built, false otherwise */ /* Returns true if hull is successfully built, false otherwise */
static bool build_hull(SkinOutput *so, Frame **frames, int totframe) static bool build_hull(SkinOutput *so, Frame **frames, int totframe)
{ {
@ -370,7 +374,7 @@ static bool build_hull(SkinOutput *so, Frame **frames, int totframe)
return true; return true;
#else #else
UNUSED_VARS(so, frames, totframe, skin_frame_find_contained_faces); UNUSED_VARS(so, frames, totframe);
return false; return false;
#endif #endif
} }