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

Fix T62717: Switching Shading Modes During Sculpting

Browse Source 
Switching shader modes to material or render during a sculpting session
showed the model when the sculptsession was started. The user needed
to click that forced an update of the sculptsession.

In `sculpt_flush_update` the eevee drawing mesh is not updated when
workbench engine is used.
This commit is contained in:
Jeroen Bakker
2019-03-28 16:10:15 +01:00
parent 87ac695106
commit 1be2888bf0
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/makesrna/intern/rna_space.c
View File

@@ -643,7 +643,7 @@ static void rna_RegionView3D_view_matrix_set(PointerRNA *ptr, const float *value
ED_view3d_from_m4(mat, rv3d->ofs, rv3d->viewquat, &rv3d->dist); ED_view3d_from_m4(mat, rv3d->ofs, rv3d->viewquat, &rv3d->dist);
} }
static void rna_3DViewShading_type_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) static void rna_3DViewShading_type_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{ {
ID *id = ptr->id.data; ID *id = ptr->id.data;
if (GS(id->name) == ID_SCE) { if (GS(id->name) == ID_SCE) {
@@ -661,12 +661,25 @@ static void rna_3DViewShading_type_update(Main *bmain, Scene *UNUSED(scene), Poi
DEG_id_tag_update(&ma->id, ID_RECALC_SHADING); DEG_id_tag_update(&ma->id, ID_RECALC_SHADING);
} }
View3DShading *shading = (View3DShading*)ptr->data;
if (shading->type == OB_MATERIAL ||
(shading->type == OB_RENDER && (strcmp(scene->r.engine, RE_engine_id_BLENDER_EEVEE) == 0 ||
strcmp(scene->r.engine, RE_engine_id_CYCLES)))) {
/* When switching from workbench to render or material mode the geometry of any
* active sculpt session needs to be recalculated. */
for (Object *ob = bmain->objects.first; ob ; ob = ob->id.next) {
if (ob->sculpt) {
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
}
}
}
bScreen *screen = ptr->id.data; bScreen *screen = ptr->id.data;
for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
if (sl->spacetype == SPACE_VIEW3D) { if (sl->spacetype == SPACE_VIEW3D) {
View3D *v3d = (View3D *)sl; View3D *v3d = (View3D *)sl;
if (&v3d->shading == ptr->data) { if (&v3d->shading == shading) {
ED_view3d_shade_update(bmain, v3d, sa); ED_view3d_shade_update(bmain, v3d, sa);
return; return;
} }