diff options
m--------- | release/scripts/addons | 0 | ||||
m--------- | release/scripts/addons_contrib | 0 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_extract.h | 1 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_extract_mesh.cc | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_extract_mesh_private.h | 1 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_extract_mesh_render_data.c | 1 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 3 | ||||
m--------- | source/tools | 0 |
8 files changed, 0 insertions, 10 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 4fcdbfe7c20edfc1204c0aa46c98ea25354abcd +Subproject 27fe7f3a4f964b53af436c4da4ddea337eff0c7 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 7d78c8a63f2f4b146f9327ddc0d567a5921b94e +Subproject 5a82baad9f986722104280e8354a4427d8e9eab diff --git a/source/blender/draw/intern/draw_cache_extract.h b/source/blender/draw/intern/draw_cache_extract.h index 36756616ca7..810deaec349 100644 --- a/source/blender/draw/intern/draw_cache_extract.h +++ b/source/blender/draw/intern/draw_cache_extract.h @@ -299,7 +299,6 @@ void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph, const bool do_final, const bool do_uvedit, const bool use_subsurf_fdots, - const DRW_MeshCDMask *cd_layer_used, const Scene *scene, const ToolSettings *ts, const bool use_hide); diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.cc b/source/blender/draw/intern/draw_cache_extract_mesh.cc index aa588bbce0a..4b047ec51f8 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh.cc @@ -746,7 +746,6 @@ static void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph, const bool do_final, const bool do_uvedit, const bool use_subsurf_fdots, - const DRW_MeshCDMask *cd_layer_used, const Scene *scene, const ToolSettings *ts, const bool use_hide) @@ -853,7 +852,6 @@ static void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph, obmat, do_final, do_uvedit, - cd_layer_used, ts, iter_type); mr->use_hide = use_hide; @@ -972,7 +970,6 @@ void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph, const bool do_final, const bool do_uvedit, const bool use_subsurf_fdots, - const DRW_MeshCDMask *cd_layer_used, const Scene *scene, const ToolSettings *ts, const bool use_hide) @@ -989,7 +986,6 @@ void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph, do_final, do_uvedit, use_subsurf_fdots, - cd_layer_used, scene, ts, use_hide); diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_private.h b/source/blender/draw/intern/draw_cache_extract_mesh_private.h index fbce3b17a40..7640582645f 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh_private.h +++ b/source/blender/draw/intern/draw_cache_extract_mesh_private.h @@ -451,7 +451,6 @@ MeshRenderData *mesh_render_data_create(Mesh *me, const float obmat[4][4], const bool do_final, const bool do_uvedit, - const DRW_MeshCDMask *cd_used, const ToolSettings *ts, const eMRIterType iter_type); void mesh_render_data_free(MeshRenderData *mr); diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c index 56b31a36fe5..bec8159c6ad 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c @@ -238,7 +238,6 @@ MeshRenderData *mesh_render_data_create(Mesh *me, const float obmat[4][4], const bool do_final, const bool do_uvedit, - const DRW_MeshCDMask *UNUSED(cd_used), const ToolSettings *ts, const eMRIterType iter_type) { diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 0d91432d4e5..3cc71e47f28 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -1569,7 +1569,6 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph, false, true, false, - &cache->cd_used, scene, ts, true); @@ -1588,7 +1587,6 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph, false, false, use_subsurf_fdots, - &cache->cd_used, scene, ts, true); @@ -1606,7 +1604,6 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph, true, false, use_subsurf_fdots, - &cache->cd_used, scene, ts, use_hide); diff --git a/source/tools b/source/tools -Subproject f99d29ae3e6ad44d45d79309454c45f8088781a +Subproject 01f51a0e551ab730f0934dc6488613690ac4bf8 |