[Bf-blender-cvs] [32d390c6780] sculpt-dev: fix a char* that should have been a const char *.

Joseph Eagar noreply at git.blender.org
Wed Sep 29 12:34:07 CEST 2021


Commit: 32d390c67808b18a57eb19bdb1b62392b5297671
Author: Joseph Eagar
Date:   Wed Sep 29 03:33:55 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB32d390c67808b18a57eb19bdb1b62392b5297671

fix a char* that should have been a const char *.

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

M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/sculpt_paint/sculpt_intern.h

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 042e9a54abc..c5178444d48 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -470,7 +470,7 @@ void SCULPT_vertex_persistent_normal_get(SculptSession *ss, SculptVertRef vertex
 static bool sculpt_temp_customlayer_get(SculptSession *ss,
                                         AttributeDomain domain,
                                         int proptype,
-                                        char *name,
+                                        const char *name,
                                         SculptCustomLayer *out,
                                         bool autocreate,
                                         SculptLayerParams *params)
@@ -775,8 +775,11 @@ float SCULPT_vertex_mask_get(SculptSession *ss, SculptVertRef index)
   return 0.0f;
 }
 
-bool SCULPT_temp_customlayer_ensure(
-    SculptSession *ss, AttributeDomain domain, int proptype, char *name, SculptLayerParams *params)
+bool SCULPT_temp_customlayer_ensure(SculptSession *ss,
+                                    AttributeDomain domain,
+                                    int proptype,
+                                    const char *name,
+                                    SculptLayerParams *params)
 {
   SculptCustomLayer scl;
   bool ret = sculpt_temp_customlayer_get(ss, domain, proptype, name, &scl, true, params);
@@ -839,7 +842,7 @@ bool SCULPT_temp_customlayer_release(SculptSession *ss, SculptCustomLayer *scl)
 bool SCULPT_temp_customlayer_get(SculptSession *ss,
                                  AttributeDomain domain,
                                  int proptype,
-                                 char *name,
+                                 const char *name,
                                  SculptCustomLayer *scl,
                                  SculptLayerParams *params)
 {
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index 760be021dfc..fdb35b50c96 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -1836,12 +1836,12 @@ Access per element data with SCULPT_temp_cdata_get.
 bool SCULPT_temp_customlayer_ensure(SculptSession *ss,
                                     AttributeDomain domain,
                                     int proptype,
-                                    char *name,
+                                    const char *name,
                                     SculptLayerParams *params);
 bool SCULPT_temp_customlayer_get(SculptSession *ss,
                                  AttributeDomain domain,
                                  int proptype,
-                                 char *name,
+                                 const char *name,
                                  SculptCustomLayer *scl,
                                  SculptLayerParams *params);
 bool SCULPT_temp_customlayer_release(SculptSession *ss, SculptCustomLayer *scl);



More information about the Bf-blender-cvs mailing list