[Bf-blender-cvs] [fcb6514abae] temp-fracture-modifier-2.8: null pointer crash fix

[Martin Felke]

Commit: fcb6514abae3398ef50ebf0fee89a3837560bca1
Author: Martin Felke
Date:   Sat Mar 9 23:29:48 2019 +0100
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rBfcb6514abae3398ef50ebf0fee89a3837560bca1

null pointer crash fix

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

M       source/blender/blenkernel/intern/boolean.c

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

diff --git a/source/blender/blenkernel/intern/boolean.c 
b/source/blender/blenkernel/intern/boolean.c
index 679f6f9a481..d30c294ecc0 100644
--- a/source/blender/blenkernel/intern/boolean.c
+++ b/source/blender/blenkernel/intern/boolean.c
@@ -157,6 +157,7 @@ Mesh *BKE_boolean_operation(Mesh *mesh, struct Object *ob,
 
                                dm->needsFree = 1;
                                dm->release(dm);
+                               result = mesh;
 
                                if (dm_result && dm_result != dm_other)
                                {
@@ -165,9 +166,10 @@ Mesh *BKE_boolean_operation(Mesh *mesh, struct Object *ob,
 
                                        dm_other->needsFree = 1;
                                        dm_other->release(dm_other);
+
+                                       result->runtime.cd_dirty_vert |= 
CD_MASK_NORMAL;
                                }
 
-                               result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
 #ifdef DEBUG_TIME
                        TIMEIT_END(boolean_carve);
 #endif

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs