[Bf-blender-cvs] [03ff3aebc4e] blender2.8: Weight Paint: draw from original mesh

Campbell Barton noreply at git.blender.org
Wed Jul 4 16:28:39 CEST 2018


Commit: 03ff3aebc4e12a5274644e5595c8995fc2fc8638
Author: Campbell Barton
Date:   Wed Jul 4 16:27:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB03ff3aebc4e12a5274644e5595c8995fc2fc8638

Weight Paint: draw from original mesh

Selection changes weren't showing.

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

M	source/blender/draw/modes/paint_weight_mode.c

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

diff --git a/source/blender/draw/modes/paint_weight_mode.c b/source/blender/draw/modes/paint_weight_mode.c
index 2b510a9a4c9..14fae743d8c 100644
--- a/source/blender/draw/modes/paint_weight_mode.c
+++ b/source/blender/draw/modes/paint_weight_mode.c
@@ -38,6 +38,8 @@
 
 #include "BKE_mesh.h"
 
+#include "DEG_depsgraph_query.h"
+
 extern struct GPUUniformBuffer *globals_ubo; /* draw_common.c */
 extern struct GlobalsUboStorage ts; /* draw_common.c */
 
@@ -181,6 +183,8 @@ static void PAINT_WEIGHT_cache_populate(void *vedata, Object *ob)
 	const View3D *v3d = draw_ctx->v3d;
 
 	if ((ob->type == OB_MESH) && (ob == draw_ctx->obact)) {
+		/* We're always painting on original, display original data. */
+		ob = DEG_get_original_object(ob);
 		const Mesh *me = ob->data;
 		const bool use_wire = (v3d->overlay.paint_flag & V3D_OVERLAY_PAINT_WIRE) != 0;
 		const bool use_surface = v3d->overlay.weight_paint_mode_opacity != 0.0f;



More information about the Bf-blender-cvs mailing list