[Bf-blender-cvs] [e7b9d49e916] greasepencil-object: Fix/workaround crash opening almost any Spring file

Sergey Sharybin noreply at git.blender.org
Fri Dec 7 17:15:48 CET 2018


Commit: e7b9d49e916b8e61365d729d14984cbd5eeaaf02
Author: Sergey Sharybin
Date:   Fri Dec 7 12:41:46 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe7b9d49e916b8e61365d729d14984cbd5eeaaf02

Fix/workaround crash opening almost any Spring file

The issue was caused mpoly array urequired by the cache filling,
but the pointer was never set when preparing render data.

Seems this change is safe enough, in terms it shouldn't be
causing slowdown, since the assignment of mpoly is cheap, but
hard to tell if there is anything else affected by thing underneath.

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

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 89b73d5e39a..f3bb7875a2e 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -5077,7 +5077,7 @@ GPUBatch *DRW_mesh_batch_cache_get_wireframes_face(Mesh *me)
 	MeshBatchCache *cache = mesh_batch_cache_get(me);
 
 	if (cache->edges_face_overlay == NULL) {
-		const int options = MR_DATATYPE_VERT | MR_DATATYPE_EDGE | MR_DATATYPE_LOOP | MR_DATATYPE_LOOPTRI;
+		const int options = MR_DATATYPE_VERT | MR_DATATYPE_EDGE | MR_DATATYPE_LOOP | MR_DATATYPE_LOOPTRI | MR_DATATYPE_POLY;
 
 		/* Hack to show the final result. */
 		const bool use_em_final = (



More information about the Bf-blender-cvs mailing list