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 +21 -26
2 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 81818b797b - Show all commits

2
source/blender/draw/engines/gpencil/gpencil_engine.c
View File

@ -536,7 +536,7 @@ static void gpencil_stroke_cache_populate(bGPDlayer *gpl,
gpencil_drawcall_add(iter, geom, vfirst, vcount); gpencil_drawcall_add(iter, geom, vfirst, vcount);
} }
iter->stroke_index_last = gps->runtime.stroke_start + gps->totpoints + 1; iter->stroke_index_last = gps->runtime.vertex_start + gps->totpoints + 1;
} }
static void gpencil_sbuffer_cache_populate_fast(GPENCIL_Data *vedata, gpIterPopulateData *iter) static void gpencil_sbuffer_cache_populate_fast(GPENCIL_Data *vedata, gpIterPopulateData *iter)

31
source/blender/editors/sculpt_paint/sculpt_dyntopo.cc
View File

@ -309,37 +309,32 @@ static int dyntopo_warning_popup(bContext *C, wmOperatorType *ot, enum eDynTopoW
return OPERATOR_INTERFACE; return OPERATOR_INTERFACE;
} }
static bool dyntopo_supports_customdata_layers(const blender::Span<CustomDataLayer> layers, static bool dyntopo_supports_layer(const CustomDataLayer &layer, const int elem_num)
int totelem)
{ {
for (const CustomDataLayer &layer : layers) {
if (CD_TYPE_AS_MASK(layer.type) & CD_MASK_PROP_ALL) { if (CD_TYPE_AS_MASK(layer.type) & CD_MASK_PROP_ALL) {
if (layer.name[0] == '\0') { if (STREQ(layer.name, ".sculpt_face_set")) {
return false;
}
if (STREQ(layer.name, ".sculpt_face_sets") && totelem > 0) {
int *fsets = static_cast<int *>(layer.data);
int fset = fsets[0];
/* Check if only one face set exists. */ /* Check if only one face set exists. */
for (int i : IndexRange(totelem)) { const blender::Span<int> face_sets(static_cast<const int *>(layer.data), elem_num);
if (fsets[i] != fset) { for (const int i : face_sets.index_range()) {
if (face_sets[i] != face_sets.first()) {
return false; return false;
} }
} }
return true; return true;
} }
/* Some data is stored as generic attributes on #Mesh but in flags or fields on #BMesh. */
/* Some data is stored as generic attributes on #Mesh but in flags or field on #BMesh. */
return BM_attribute_stored_in_bmesh_builtin(layer.name); return BM_attribute_stored_in_bmesh_builtin(layer.name);
} }
/* Some layers just encode #Mesh topology or are handled as special cases for dyntopo. */ /* Some layers just encode #Mesh topology or are handled as special cases for dyntopo. */
return ELEM(layer.type, CD_MEDGE, CD_MFACE, CD_MLOOP, CD_MPOLY, CD_PAINT_MASK, CD_ORIGINDEX); return ELEM(layer.type, CD_MEDGE, CD_MPOLY, CD_MLOOP, CD_PAINT_MASK, CD_ORIGINDEX);
} }
return true; static bool dyntopo_supports_customdata_layers(const blender::Span<CustomDataLayer> layers,
const int elem_num)
{
return std::all_of(layers.begin(), layers.end(), [&](const CustomDataLayer &layer) {
return dyntopo_supports_layer(layer, elem_num);
});
} }
enum eDynTopoWarnFlag SCULPT_dynamic_topology_check(Scene *scene, Object *ob) enum eDynTopoWarnFlag SCULPT_dynamic_topology_check(Scene *scene, Object *ob)