[Bf-blender-cvs] [b87b6e8e289] blender2.8: Fix T59211: Edit-mesh display crashes

Campbell Barton noreply at git.blender.org
Wed Dec 12 01:18:07 CET 2018


Commit: b87b6e8e289cdc15c730341d840ca5fd9836a430
Author: Campbell Barton
Date:   Wed Dec 12 11:12:34 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBb87b6e8e289cdc15c730341d840ca5fd9836a430

Fix T59211: Edit-mesh display crashes

Caused by ae1f563899de4

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

M	source/blender/draw/intern/draw_cache_impl_mesh.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 508f3d6da69..9438995ec6f 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -949,20 +949,19 @@ static MeshRenderData *mesh_render_data_create_ex(
 }
 
 /* Warning replace mesh pointer. */
-#define MBC_GET_FINAL_MESH(mesh) do { \
+#define MBC_GET_FINAL_MESH(me) \
 	/* Hack to show the final result. */ \
-	const bool use_em_final = ( \
-	        (mesh)->edit_btmesh && \
-	        (mesh)->edit_btmesh->mesh_eval_final && \
-	        ((mesh)->edit_btmesh->mesh_eval_final->runtime.is_original == false)); \
-	Mesh me_fake; \
-	if (use_em_final) { \
-		me_fake = *(mesh)->edit_btmesh->mesh_eval_final; \
-		me_fake.mat = (mesh)->mat; \
-		me_fake.totcol = (mesh)->totcol; \
-		(mesh) = &me_fake; \
-	} \
-} while (0)
+	const bool _use_em_final = ( \
+	        (me)->edit_btmesh && \
+	        (me)->edit_btmesh->mesh_eval_final && \
+	        ((me)->edit_btmesh->mesh_eval_final->runtime.is_original == false)); \
+	Mesh _me_fake; \
+	if (_use_em_final) { \
+		_me_fake = *(me)->edit_btmesh->mesh_eval_final; \
+		_me_fake.mat = (me)->mat; \
+		_me_fake.totcol = (me)->totcol; \
+		(me) = &_me_fake; \
+	} ((void)0)
 
 static void mesh_render_data_free(MeshRenderData *rdata)
 {



More information about the Bf-blender-cvs mailing list