Merge branch 'blender-v2.82-release'

3 files changed, 65 insertions, 70 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 4b0af273f7f..7da9af55330 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -382,70 +382,74 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
     }
   }
 
-  if (DRW_state_draw_support() && !LOOK_DEV_STUDIO_LIGHT_ENABLED(draw_ctx->v3d)) {
+  if (DRW_state_draw_support()) {
     DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS_EQUAL |
                      DRW_STATE_CULL_BACK;
     DRW_PASS_CREATE(psl->probe_display, state);
 
-    /* Cube Display */
-    if (scene_eval->eevee.flag & SCE_EEVEE_SHOW_CUBEMAPS && lcache->cube_len > 1) {
-      int cube_len = lcache->cube_len - 1; /* don't count the world. */
-      DRWShadingGroup *grp = DRW_shgroup_create(EEVEE_shaders_probe_cube_display_sh_get(),
-                                                psl->probe_display);
-
-      DRW_shgroup_uniform_texture_ref(grp, "probeCubes", &lcache->cube_tx.tex);
-      DRW_shgroup_uniform_block(grp, "probe_block", sldata->probe_ubo);
-      DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
-      DRW_shgroup_uniform_vec3(grp, "screen_vecs[0]", DRW_viewport_screenvecs_get(), 2);
-      DRW_shgroup_uniform_float_copy(
-          grp, "sphere_size", scene_eval->eevee.gi_cubemap_draw_size * 0.5f);
-      /* TODO (fclem) get rid of those UBO. */
-      DRW_shgroup_uniform_block(grp, "planar_block", sldata->planar_ubo);
-      DRW_shgroup_uniform_block(grp, "grid_block", sldata->grid_ubo);
-
-      DRW_shgroup_call_procedural_triangles(grp, NULL, cube_len * 2);
-    }
-
-    /* Grid Display */
-    if (scene_eval->eevee.flag & SCE_EEVEE_SHOW_IRRADIANCE) {
-      EEVEE_LightGrid *egrid = lcache->grid_data + 1;
-      for (int p = 1; p < lcache->grid_len; p++, egrid++) {
-        DRWShadingGroup *shgrp = DRW_shgroup_create(EEVEE_shaders_probe_grid_display_sh_get(),
-                                                    psl->probe_display);
-
-        DRW_shgroup_uniform_int(shgrp, "offset", &egrid->offset, 1);
-        DRW_shgroup_uniform_ivec3(shgrp, "grid_resolution", egrid->resolution, 1);
-        DRW_shgroup_uniform_vec3(shgrp, "corner", egrid->corner, 1);
-        DRW_shgroup_uniform_vec3(shgrp, "increment_x", egrid->increment_x, 1);
-        DRW_shgroup_uniform_vec3(shgrp, "increment_y", egrid->increment_y, 1);
-        DRW_shgroup_uniform_vec3(shgrp, "increment_z", egrid->increment_z, 1);
-        DRW_shgroup_uniform_vec3(shgrp, "screen_vecs[0]", DRW_viewport_screenvecs_get(), 2);
-        DRW_shgroup_uniform_texture_ref(shgrp, "irradianceGrid", &lcache->grid_tx.tex);
+    if (!LOOK_DEV_STUDIO_LIGHT_ENABLED(draw_ctx->v3d)) {
+      /* Cube Display */
+      if (scene_eval->eevee.flag & SCE_EEVEE_SHOW_CUBEMAPS && lcache->cube_len > 1) {
+        int cube_len = lcache->cube_len - 1; /* don't count the world. */
+        DRWShadingGroup *grp = DRW_shgroup_create(EEVEE_shaders_probe_cube_display_sh_get(),
+                                                  psl->probe_display);
+
+        DRW_shgroup_uniform_texture_ref(grp, "probeCubes", &lcache->cube_tx.tex);
+        DRW_shgroup_uniform_block(grp, "probe_block", sldata->probe_ubo);
+        DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
+        DRW_shgroup_uniform_vec3(grp, "screen_vecs[0]", DRW_viewport_screenvecs_get(), 2);
         DRW_shgroup_uniform_float_copy(
-            shgrp, "sphere_size", scene_eval->eevee.gi_irradiance_draw_size * 0.5f);
+            grp, "sphere_size", scene_eval->eevee.gi_cubemap_draw_size * 0.5f);
         /* TODO (fclem) get rid of those UBO. */
-        DRW_shgroup_uniform_block(shgrp, "probe_block", sldata->probe_ubo);
-        DRW_shgroup_uniform_block(shgrp, "planar_block", sldata->planar_ubo);
-        DRW_shgroup_uniform_block(shgrp, "grid_block", sldata->grid_ubo);
-        DRW_shgroup_uniform_block(shgrp, "common_block", sldata->common_ubo);
-        int tri_count = egrid->resolution[0] * egrid->resolution[1] * egrid->resolution[2] * 2;
-        DRW_shgroup_call_procedural_triangles(shgrp, NULL, tri_count);
+        DRW_shgroup_uniform_block(grp, "planar_block", sldata->planar_ubo);
+        DRW_shgroup_uniform_block(grp, "grid_block", sldata->grid_ubo);
+
+        DRW_shgroup_call_procedural_triangles(grp, NULL, cube_len * 2);
+      }
+
+      /* Grid Display */
+      if (scene_eval->eevee.flag & SCE_EEVEE_SHOW_IRRADIANCE) {
+        EEVEE_LightGrid *egrid = lcache->grid_data + 1;
+        for (int p = 1; p < lcache->grid_len; p++, egrid++) {
+          DRWShadingGroup *shgrp = DRW_shgroup_create(EEVEE_shaders_probe_grid_display_sh_get(),
+                                                      psl->probe_display);
+
+          DRW_shgroup_uniform_int(shgrp, "offset", &egrid->offset, 1);
+          DRW_shgroup_uniform_ivec3(shgrp, "grid_resolution", egrid->resolution, 1);
+          DRW_shgroup_uniform_vec3(shgrp, "corner", egrid->corner, 1);
+          DRW_shgroup_uniform_vec3(shgrp, "increment_x", egrid->increment_x, 1);
+          DRW_shgroup_uniform_vec3(shgrp, "increment_y", egrid->increment_y, 1);
+          DRW_shgroup_uniform_vec3(shgrp, "increment_z", egrid->increment_z, 1);
+          DRW_shgroup_uniform_vec3(shgrp, "screen_vecs[0]", DRW_viewport_screenvecs_get(), 2);
+          DRW_shgroup_uniform_texture_ref(shgrp, "irradianceGrid", &lcache->grid_tx.tex);
+          DRW_shgroup_uniform_float_copy(
+              shgrp, "sphere_size", scene_eval->eevee.gi_irradiance_draw_size * 0.5f);
+          /* TODO (fclem) get rid of those UBO. */
+          DRW_shgroup_uniform_block(shgrp, "probe_block", sldata->probe_ubo);
+          DRW_shgroup_uniform_block(shgrp, "planar_block", sldata->planar_ubo);
+          DRW_shgroup_uniform_block(shgrp, "grid_block", sldata->grid_ubo);
+          DRW_shgroup_uniform_block(shgrp, "common_block", sldata->common_ubo);
+          int tri_count = egrid->resolution[0] * egrid->resolution[1] * egrid->resolution[2] * 2;
+          DRW_shgroup_call_procedural_triangles(shgrp, NULL, tri_count);
+        }
       }
     }
 
     /* Planar Display */
-    DRW_shgroup_instance_format(e_data.format_probe_display_planar,
-                                {
-                                    {"probe_id", DRW_ATTR_INT, 1},
-                                    {"probe_mat", DRW_ATTR_FLOAT, 16},
-                                });
-
-    DRWShadingGroup *grp = DRW_shgroup_create(EEVEE_shaders_probe_planar_display_sh_get(),
-                                              psl->probe_display);
-    DRW_shgroup_uniform_texture_ref(grp, "probePlanars", &txl->planar_pool);
-
-    stl->g_data->planar_display_shgrp = DRW_shgroup_call_buffer_instance(
-        grp, e_data.format_probe_display_planar, DRW_cache_quad_get());
+    {
+      DRW_shgroup_instance_format(e_data.format_probe_display_planar,
+                                  {
+                                      {"probe_id", DRW_ATTR_INT, 1},
+                                      {"probe_mat", DRW_ATTR_FLOAT, 16},
+                                  });
+
+      DRWShadingGroup *grp = DRW_shgroup_create(EEVEE_shaders_probe_planar_display_sh_get(),
+                                                psl->probe_display);
+      DRW_shgroup_uniform_texture_ref(grp, "probePlanars", &txl->planar_pool);
+
+      stl->g_data->planar_display_shgrp = DRW_shgroup_call_buffer_instance(
+          grp, e_data.format_probe_display_planar, DRW_cache_quad_get());
+    }
   }
   else {
     stl->g_data->planar_display_shgrp = NULL;
diff --git a/source/blender/draw/engines/overlay/overlay_edit_mesh.c b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
index e016ccc6c0e..ee1b606bee5 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_mesh.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
@@ -96,7 +96,6 @@ void OVERLAY_edit_mesh_cache_init(OVERLAY_Data *vedata)
 
   if ((flag & V3D_OVERLAY_EDIT_FACES) == 0) {
     pd->edit_mesh.do_faces = false;
-    pd->edit_mesh.do_zbufclip = false;
   }
   if ((flag & V3D_OVERLAY_EDIT_EDGES) == 0) {
     if ((tsettings->selectmode & SCE_SELECT_EDGE) == 0) {
diff --git a/source/blender/draw/intern/draw_cache_impl_curve.c b/source/blender/draw/intern/draw_cache_impl_curve.c
index 25699cd7653..1c3996e2290 100644
--- a/source/blender/draw/intern/draw_cache_impl_curve.c
+++ b/source/blender/draw/intern/draw_cache_impl_curve.c
@@ -458,16 +458,10 @@ static void curve_batch_cache_init(Curve *cu)
 #endif
 
   cache->cd_used = 0;
-  cache->mat_len = max_ii(1, cu->totcol);
-  cache->surf_per_mat_tris = MEM_mallocN(sizeof(*cache->surf_per_mat_tris) * cache->mat_len,
+  cache->mat_len = DRW_curve_material_count_get(cu);
+  cache->surf_per_mat_tris = MEM_callocN(sizeof(*cache->surf_per_mat_tris) * cache->mat_len,
                                          __func__);
-  cache->surf_per_mat = MEM_mallocN(sizeof(*cache->surf_per_mat) * cache->mat_len, __func__);
-
-  /* TODO Might be wiser to alloc in one chunk. */
-  for (int i = 0; i < cache->mat_len; i++) {
-    cache->surf_per_mat_tris[i] = MEM_callocN(sizeof(GPUIndexBuf), "GPUIndexBuf");
-    cache->surf_per_mat[i] = MEM_callocN(sizeof(GPUBatch), "GPUBatch");
-  }
+  cache->surf_per_mat = MEM_callocN(sizeof(*cache->surf_per_mat) * cache->mat_len, __func__);
 
   cache->is_editmode = (cu->editnurb != NULL) || (cu->editfont != NULL);
 
@@ -934,15 +928,13 @@ void DRW_curve_batch_cache_create_requested(Object *ob)
 
   /* Verify that all surface batches have needed attribute layers. */
   /* TODO(fclem): We could be a bit smarter here and only do it per material. */
-  for (int i = 0; i < cache->mat_len; i++) {
-    if ((cache->cd_used & cache->cd_needed) != cache->cd_needed) {
+  if ((cache->cd_used & cache->cd_needed) != cache->cd_needed) {
+    for (int i = 0; i < cache->mat_len; i++) {
       /* We can't discard batches at this point as they have been
        * referenced for drawing. Just clear them in place. */
-      GPU_batch_clear(cache->surf_per_mat[i]);
-      memset(cache->surf_per_mat[i], 0, sizeof(*cache->surf_per_mat[i]));
+      GPU_BATCH_CLEAR_SAFE(cache->surf_per_mat[i]);
     }
-  }
-  if ((cache->cd_used & cache->cd_needed) != cache->cd_needed) {
+
     cache->cd_used |= cache->cd_needed;
     cache->cd_needed = 0;
   }