blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Sculpt-dev: fix bugs in recent merge

This commit is contained in:
Joseph Eagar 2022-04-09 02:13:21 -07:00
parent a38889b2bd
commit ed550e1da9
7 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 63699f968344db7dc853d2c5972325beea44900c
Subproject commit 716dc02ec30c0810513f7b4adc4ae865ae50c4e6

2
release/scripts/addons

@ -1 +1 @@
Subproject commit baa581415c7ed23d7c45ef873631748135672683
Subproject commit 787ea78f7fa6f0373d80ba1247768402df93f8ad

1
source/blender/blenkernel/BKE_attribute.h
View File

@ -123,6 +123,7 @@ struct CustomDataLayer *BKE_id_attributes_render_color_get(const struct ID *id);
void BKE_id_attributes_render_color_set(struct ID *id, struct CustomDataLayer *active_layer);
bool BKE_id_attribute_calc_unique_name(struct ID *id, const char *name, char *outname);
struct CustomDataLayer *BKE_id_attributes_color_find(const struct ID *id, const char *name);
#ifdef __cplusplus
}

3
source/blender/blenkernel/intern/pbvh.c
View File

@ -5301,6 +5301,9 @@ bool BKE_pbvh_get_origvert(
if (mv->stroke_id != pbvh->stroke_id) {
mv->stroke_id = pbvh->stroke_id;
copy_v3_v3(mv->origco, v->co);
copy_v3_v3(mv->origno, v->no);
if (pbvh->cd_vert_mask_offset != -1) {
mv->origmask = (short)(BM_ELEM_CD_GET_FLOAT(v, pbvh->cd_vert_mask_offset) * 65535.0f);
}

5
source/blender/editors/sculpt_paint/sculpt_dyntopo.c
View File

@ -701,7 +701,10 @@ void SCULPT_dynamic_topology_enable_ex(Main *bmain, Depsgraph *depsgraph, Scene
#endif
SCULPT_dyntopo_node_layers_add(ss, ob);
BKE_pbvh_update_sculpt_verts(ss->pbvh);
if (ss->pbvh) {
BKE_pbvh_update_sculpt_verts(ss->pbvh);
}
if (SCULPT_has_persistent_base(ss)) {
SCULPT_ensure_persistent_layers(ss, ob);

4
source/blender/editors/sculpt_paint/sculpt_undo.c
View File

@ -794,7 +794,9 @@ static void sculpt_undo_bmesh_enable(Object *ob, SculptUndoNode *unode, bool is_
SCULPT_dyntopo_node_layers_add(ss, ob);
SCULPT_update_customdata_refs(ss, ob);
BKE_pbvh_update_sculpt_verts(ss->pbvh);
if (ss->pbvh) {
BKE_pbvh_update_sculpt_verts(ss->pbvh);
}
if (!ss->bm_log) {
/* Restore the BMLog using saved entries. */

2
source/tools

@ -1 +1 @@
Subproject commit 4c1e01e3e309282beb1af3b1eddb2c7f9a666b5d
Subproject commit 1e658ca996f11e5ff3398d89bd81f5b719304a57