[Bf-blender-cvs] [8600d4491fa] master: Fix: Const warning in editmesh_knife.c

Erik noreply at git.blender.org
Mon Nov 22 23:41:24 CET 2021


Commit: 8600d4491fa4b349cb80241382c503abaf9c5ce9
Author: Erik
Date:   Mon Nov 22 23:40:05 2021 +0100
Branches: master
https://developer.blender.org/rB8600d4491fa4b349cb80241382c503abaf9c5ce9

Fix: Const warning in editmesh_knife.c

Fixes a warning caused by freeing a const pointer.
This commit removes the const modifier.

Differential Revision: https://developer.blender.org/D13321

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/editors/mesh/editmesh_knife.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 8ee2942570f..24c2b841925 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 8ee2942570f08d10484bb2328d0d1b0aaaa0367c
+Subproject commit 24c2b84192564c2c06a9ab98d8e310433266c2a4
diff --git a/release/scripts/addons b/release/scripts/addons
index f2a08d80ccd..4de1bcce5a2 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f2a08d80ccd3c13af304525778df3905f95bd44d
+Subproject commit 4de1bcce5a2caa31131c40cc19f0a1851c2eb635
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index cd04f40dedf..76d48432834 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -236,7 +236,7 @@ typedef struct KnifeTool_OpData {
   GHash *facetrimap;
 
   KnifeBVH bvh;
-  const float (**cagecos)[3];
+  float (**cagecos)[3];
 
   BLI_mempool *kverts;
   BLI_mempool *kedges;
@@ -3975,7 +3975,7 @@ static void knifetool_init_cagecos(KnifeTool_OpData *kcd, Object *ob, uint base_
 
   BM_mesh_elem_index_ensure(em_eval->bm, BM_VERT);
 
-  kcd->cagecos[base_index] = (const float(*)[3])BKE_editmesh_vert_coords_alloc(
+  kcd->cagecos[base_index] = BKE_editmesh_vert_coords_alloc(
       kcd->vc.depsgraph, em_eval, scene_eval, obedit_eval, NULL);
 }
 
diff --git a/source/tools b/source/tools
index 2e8c8792488..b22d19e47f4 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2e8c879248822c8e500ed49d79acc605e5aa75b9
+Subproject commit b22d19e47f4d0353082f3d9f30ee8d244c5266d5



More information about the Bf-blender-cvs mailing list