diff --git a/intern/cycles/render/film.h b/intern/cycles/render/film.h
index 20f6261a871..2c4e07d60ae 100644
--- a/intern/cycles/render/film.h
+++ b/intern/cycles/render/film.h
@@ -91,7 +91,7 @@ class Film : public Node {
   void device_free(Device *device, DeviceScene *dscene, Scene *scene);
 
   bool modified(const Film &film);
-  void tag_passes_update(Scene *scene, const vector<Pass> &passes_, bool update_passes=true);
+  void tag_passes_update(Scene *scene, const vector<Pass> &passes_, bool update_passes = true);
   void tag_update(Scene *scene);
 };
 
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 6235b60ea74..c1a4c255710 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -9026,7 +9026,7 @@ void sculpt_geometry_preview_lines_update(bContext *C, SculptSession *ss, float
     return;
   }
 
-  BKE_sculpt_update_object_for_edit(depsgraph, ob, true, true);
+  BKE_sculpt_update_object_for_edit(depsgraph, ob, true, false);
 
   if (!ss->pmap) {
     return;
@@ -9038,9 +9038,10 @@ void sculpt_geometry_preview_lines_update(bContext *C, SculptSession *ss, float
   char *visited_vertices = MEM_callocN(sculpt_vertex_count_get(ss) * sizeof(char),
                                        "visited vertices");
 
+  int max_preview_points = sculpt_vertex_count_get(ss) * 4;
   if (ss->preview_vert_index_list == NULL) {
-    ss->preview_vert_index_list = MEM_callocN(4 * sizeof(int) * sculpt_vertex_count_get(ss),
-                                              "preview lines");
+    printf("ALLOCATING\n");
+    ss->preview_vert_index_list = MEM_callocN(sizeof(int) * max_preview_points, "preview lines");
   }
 
   BLI_Stack *not_visited_vertices = BLI_stack_new(sizeof(VertexTopologyIterator),
@@ -9055,17 +9056,20 @@ void sculpt_geometry_preview_lines_update(bContext *C, SculptSession *ss, float
     SculptVertexNeighborIter ni;
     sculpt_vertex_neighbors_iter_begin(ss, c_mevit.v, ni)
     {
-      VertexTopologyIterator new_entry;
-      new_entry.v = ni.index;
-      new_entry.it = c_mevit.it + 1;
-      ss->preview_vert_index_list[totpoints] = c_mevit.v;
-      totpoints++;
-      ss->preview_vert_index_list[totpoints] = new_entry.v;
-      totpoints++;
-      if (visited_vertices[(int)ni.index] == 0) {
-        visited_vertices[(int)ni.index] = 1;
-        if (len_squared_v3v3(brush_co, sculpt_vertex_co_get(ss, new_entry.v)) < radius * radius) {
-          BLI_stack_push(not_visited_vertices, &new_entry);
+      if (totpoints + (ni.size * 2) < max_preview_points) {
+        VertexTopologyIterator new_entry;
+        new_entry.v = ni.index;
+        new_entry.it = c_mevit.it + 1;
+        ss->preview_vert_index_list[totpoints] = c_mevit.v;
+        totpoints++;
+        ss->preview_vert_index_list[totpoints] = new_entry.v;
+        totpoints++;
+        if (visited_vertices[(int)ni.index] == 0) {
+          visited_vertices[(int)ni.index] = 1;
+          if (len_squared_v3v3(brush_co, sculpt_vertex_co_get(ss, new_entry.v)) <
+              radius * radius) {
+            BLI_stack_push(not_visited_vertices, &new_entry);
+          }
         }
       }
     }
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 46abaef48d5..f8ed0aa78b7 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1507,8 +1507,7 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna)
   prop = RNA_def_property(srna, "icon_folder", PROP_FLOAT, PROP_COLOR_GAMMA);
   RNA_def_property_float_sdna(prop, NULL, "icon_folder");
   RNA_def_property_array(prop, 4);
-  RNA_def_property_ui_text(
-      prop, "File Folders", "Color of folders in the file browser");
+  RNA_def_property_ui_text(prop, "File Folders", "Color of folders in the file browser");
   RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
 
   prop = RNA_def_property(srna, "icon_border_intensity", PROP_FLOAT, PROP_FACTOR);