[Bf-blender-cvs] [fe8509af612] master: Fix uvsculpt null pointer reference in paint.c

Sebastian Parborg noreply at git.blender.org
Wed Sep 9 16:19:57 CEST 2020


Commit: fe8509af612805238c2be5d695e2d6f7676fd730
Author: Sebastian Parborg
Date:   Wed Sep 9 16:05:19 2020 +0200
Branches: master
https://developer.blender.org/rBfe8509af612805238c2be5d695e2d6f7676fd730

Fix uvsculpt null pointer reference in paint.c

ASAN reported null pointer access when going into edit mode on the
default cube.

Check in uvculpt has been initialized before trying to use it.

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

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

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

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index bc089d7bd80..278c6c0ee53 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -406,7 +406,7 @@ Paint *BKE_paint_get_active(Scene *sce, ViewLayer *view_layer)
         case OB_MODE_WEIGHT_GPENCIL:
           return &ts->gp_weightpaint->paint;
         case OB_MODE_EDIT:
-          return &ts->uvsculpt->paint;
+          return ts->uvsculpt ? &ts->uvsculpt->paint : NULL;
         default:
           break;
       }



More information about the Bf-blender-cvs mailing list