[Bf-blender-cvs] [8927d416f62] master: Fix missing 3D viewport solid shading mode request for UVs and vertex colors

Brecht Van Lommel noreply at git.blender.org
Thu Sep 19 14:19:18 CEST 2019


Commit: 8927d416f624409ae38109ae81eb5bd06886d863
Author: Brecht Van Lommel
Date:   Thu Sep 19 14:03:03 2019 +0200
Branches: master
https://developer.blender.org/rB8927d416f624409ae38109ae81eb5bd06886d863

Fix missing 3D viewport solid shading mode request for UVs and vertex colors

This probably fixes no current issues, because there is another one causing
these to be computed unnecessarily.

===================================================================

M	source/blender/editors/space_view3d/view3d_draw_legacy.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index f77a42fb1c1..acc46935eb5 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -383,6 +383,14 @@ void ED_view3d_datamask(const bContext *C,
     r_cddata_masks->lmask |= CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL;
     r_cddata_masks->vmask |= CD_MASK_ORCO;
   }
+  else if (v3d->shading.type == OB_SOLID) {
+    if (v3d->shading.color_type == V3D_SHADING_TEXTURE_COLOR) {
+      r_cddata_masks->lmask |= CD_MASK_MLOOPUV;
+    }
+    if (v3d->shading.color_type == V3D_SHADING_VERTEX_COLOR) {
+      r_cddata_masks->lmask |= CD_MASK_MLOOPCOL;
+    }
+  }
 
   if ((CTX_data_mode_enum(C) == CTX_MODE_EDIT_MESH) &&
       (v3d->overlay.edit_flag & V3D_OVERLAY_EDIT_WEIGHT)) {



More information about the Bf-blender-cvs mailing list