[Bf-blender-cvs] [9e50d5847c3] temp-trimesh-sculpt: add a null pointer check

Joseph Eagar noreply at git.blender.org
Wed Oct 14 10:27:08 CEST 2020


Commit: 9e50d5847c323c339cb42471abe5979213b85890
Author: Joseph Eagar
Date:   Wed Oct 14 01:26:57 2020 -0700
Branches: temp-trimesh-sculpt
https://developer.blender.org/rB9e50d5847c323c339cb42471abe5979213b85890

add a null pointer check

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

M	source/blender/blenkernel/BKE_pbvh.h

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

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 3ee78f715e1..63d553fbbde 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -507,7 +507,7 @@ void pbvh_vertex_iter_init(PBVH *pbvh, PBVHNode *node, PBVHVertexIter *vi, int m
               if (vi.tm_cur_set != vi.tm_other_verts) {\
                 vi.tm_cur_set = vi.tm_other_verts;\
                 vi.ti = 0;\
-                if (vi.ti >= vi.tm_other_verts->cur) {\
+                if (!vi.tm_cur_set->elems || vi.ti >= vi.tm_other_verts->cur) {\
                   break;\
                 }\
               } else {\



More information about the Bf-blender-cvs mailing list