[Bf-blender-cvs] [fe03543e8df] sculpt-dev: Sculpt: fix missing NULL check

[Joseph Eagar]

Commit: fe03543e8df4f2f3b8e1bbc847c4a563b1443922
Author: Joseph Eagar
Date:   Tue Oct 12 01:05:10 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rBfe03543e8df4f2f3b8e1bbc847c4a563b1443922

Sculpt: fix missing NULL check

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

M	release/scripts/startup/bl_ui/properties_paint_common.py
M	source/blender/blenkernel/intern/dyntopo.c

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

diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 33cf5fbf462..05007c668e5 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -27,6 +27,7 @@ builtin_channel_categories = ["Cloth Tool",
     "Color",
     "Clay",
     "Pose Tool",
+    "Smear",
     "Basic",
     "Smoothing",
     "Stroke",
diff --git a/source/blender/blenkernel/intern/dyntopo.c b/source/blender/blenkernel/intern/dyntopo.c
index ce045408e28..5cbdd109405 100644
--- a/source/blender/blenkernel/intern/dyntopo.c
+++ b/source/blender/blenkernel/intern/dyntopo.c
@@ -3869,6 +3869,10 @@ static void pbvh_bmesh_collapse_edge(PBVH *pbvh,
         do {
           BMLoop *l2 = e2->l;
 
+          if (!l2) {
+            continue;
+          }
+
           do {
             BMLoop *l3 = l2->v != v ? l2->next : l2;