blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 783 Projects 19 Wiki Activity

Replace call to BMLog with origco CD layer. 

Also fixed SCULPT_HIDE_FACE_SETS.  It was 1<<16, which overlaps
SCULPT_DYNTOPO_DETAIL_MANUAL.  Changed it to 1<<17.  Someone should do
this in master too.
This commit is contained in:
Joseph Eagar 2020-11-05 16:35:42 -08:00
parent 488af21ae0
commit 228c1e5345
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6439,7 +6439,9 @@ static void sculpt_combine_proxies_task_cb(void *__restrict userdata,
if (use_orco) {
if (ss->bm) {
copy_v3_v3(val, BM_log_original_vert_co(ss->bm_log, vd.bm_vert));
float *co = BM_ELEM_CD_GET_VOID_P(vd.bm_vert, ss->cd_origco_offset);
copy_v3_v3(val, co);
//copy_v3_v3(val, BM_log_original_vert_co(ss->bm_log, vd.bm_vert));
}
else {
copy_v3_v3(val, orco[vd.i]);

2
source/blender/makesdna/DNA_scene_types.h
View File

@ -2203,7 +2203,7 @@ typedef enum eSculptFlags {
SCULPT_HIDE_MASK = (1 << 15),
/* Don't display face sets in viewport. */
SCULPT_HIDE_FACE_SETS = (1 << 16),
SCULPT_HIDE_FACE_SETS = (1 << 17),
} eSculptFlags;
/* ImagePaintSettings.mode */