[Bf-blender-cvs] [6f1af446953] master: Cleanup: remove unused parameter.

Jeroen Bakker noreply at git.blender.org
Tue Jun 1 13:18:51 CEST 2021


Commit: 6f1af446953dd52495699d3043330d963c13df4f
Author: Jeroen Bakker
Date:   Tue Jun 1 13:14:39 2021 +0200
Branches: master
https://developer.blender.org/rB6f1af446953dd52495699d3043330d963c13df4f

Cleanup: remove unused parameter.

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

M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/draw/intern/draw_cache_extract.h
M	source/blender/draw/intern/draw_cache_extract_mesh.cc
M	source/blender/draw/intern/draw_cache_extract_mesh_private.h
M	source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
M	source/blender/draw/intern/draw_cache_impl_mesh.c
M	source/tools

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

diff --git a/release/scripts/addons b/release/scripts/addons
index 4fcdbfe7c20..27fe7f3a4f9 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 4fcdbfe7c20edfc1204c0aa46c98ea25354abcd9
+Subproject commit 27fe7f3a4f964b53af436c4da4ddea337eff0c7e
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 7d78c8a63f2..5a82baad9f9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 7d78c8a63f2f4b146f9327ddc0d567a5921b94ea
+Subproject commit 5a82baad9f986722104280e8354a4427d8e9eab1
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
index f99d29ae3e6..01f51a0e551 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit f99d29ae3e6ad44d45d79309454c45f8088781a4
+Subproject commit 01f51a0e551ab730f0934dc6488613690ac4bf8f



More information about the Bf-blender-cvs mailing list