[Bf-blender-cvs] [77d3cd35b9b] tmp-workbench-rewrite2: fixes after merge

[Miguel Pozo]

Commit: 77d3cd35b9badc59a02eab706c48b875815ba016
Author: Miguel Pozo
Date:   Thu Nov 3 17:08:33 2022 +0100
Branches: tmp-workbench-rewrite2
https://developer.blender.org/rB77d3cd35b9badc59a02eab706c48b875815ba016

fixes after merge

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

M	source/blender/draw/engines/workbench/workbench_engine.cc
M	source/blender/draw/engines/workbench/workbench_state.cc

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

diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc
index c722ca08e09..ccfc22505b5 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.cc
+++ b/source/blender/draw/engines/workbench/workbench_engine.cc
@@ -303,7 +303,7 @@ class Instance {
     anti_aliasing_ps.setup_view(view, resolution);
 
     if (!scene_state.clip_planes.is_empty()) {
-      view.set_clip_planes(scene_state.clip_planes);
+      // view.set_clip_planes(scene_state.clip_planes);
     }
 
     resources.color_tx.acquire(resolution, GPU_RGBA16F);
diff --git a/source/blender/draw/engines/workbench/workbench_state.cc b/source/blender/draw/engines/workbench/workbench_state.cc
index 7799e99efe0..a6a44e7cdb1 100644
--- a/source/blender/draw/engines/workbench/workbench_state.cc
+++ b/source/blender/draw/engines/workbench/workbench_state.cc
@@ -179,7 +179,7 @@ void SceneState::init()
 
 static const CustomData *get_loop_custom_data(const Mesh *mesh)
 {
-  if (mesh->runtime.wrapper_type == ME_WRAPPER_TYPE_BMESH) {
+  if (mesh->runtime->wrapper_type == ME_WRAPPER_TYPE_BMESH) {
     BLI_assert(mesh->edit_mesh != nullptr);
     BLI_assert(mesh->edit_mesh->bm != nullptr);
     return &mesh->edit_mesh->bm->ldata;
@@ -189,7 +189,7 @@ static const CustomData *get_loop_custom_data(const Mesh *mesh)
 
 static const CustomData *get_vert_custom_data(const Mesh *mesh)
 {
-  if (mesh->runtime.wrapper_type == ME_WRAPPER_TYPE_BMESH) {
+  if (mesh->runtime->wrapper_type == ME_WRAPPER_TYPE_BMESH) {
     BLI_assert(mesh->edit_mesh != nullptr);
     BLI_assert(mesh->edit_mesh->bm != nullptr);
     return &mesh->edit_mesh->bm->vdata;
@@ -230,7 +230,8 @@ ObjectState::ObjectState(const SceneState &scene_state, Object *ob)
     return;
   }
 
-  sculpt_pbvh = BKE_sculptsession_use_pbvh_draw(ob, draw_ctx->v3d) && !DRW_state_is_image_render();
+  sculpt_pbvh = BKE_sculptsession_use_pbvh_draw(ob, draw_ctx->rv3d) &&
+                !DRW_state_is_image_render();
 
   if (sculpt_pbvh) {
     /* Shadows are unsupported in sculpt mode. We could revert to the slow