[Bf-blender-cvs] [3fb8191d1db] master: Cleanup: rename lightprobe configure to type_set

Campbell Barton noreply at git.blender.org
Mon Jan 20 07:56:28 CET 2020


Commit: 3fb8191d1dbd5c50c8bd5b0821e7cf1bb9885736
Author: Campbell Barton
Date:   Mon Jan 20 17:54:38 2020 +1100
Branches: master
https://developer.blender.org/rB3fb8191d1dbd5c50c8bd5b0821e7cf1bb9885736

Cleanup: rename lightprobe configure to type_set

Consistent with similar API functions.

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

M	source/blender/blenkernel/BKE_lightprobe.h
M	source/blender/blenkernel/intern/lightprobe.c
M	source/blender/editors/object/object_add.c
M	source/blender/makesrna/intern/rna_main_api.c

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

diff --git a/source/blender/blenkernel/BKE_lightprobe.h b/source/blender/blenkernel/BKE_lightprobe.h
index 3d59929ada7..153ad9bb915 100644
--- a/source/blender/blenkernel/BKE_lightprobe.h
+++ b/source/blender/blenkernel/BKE_lightprobe.h
@@ -29,7 +29,7 @@ struct LightProbe;
 struct Main;
 
 void BKE_lightprobe_init(struct LightProbe *probe);
-void BKE_lightprobe_configure(struct LightProbe *probe, const short lightprobe_type);
+void BKE_lightprobe_type_set(struct LightProbe *probe, const short lightprobe_type);
 void *BKE_lightprobe_add(struct Main *bmain, const char *name);
 void BKE_lightprobe_copy_data(struct Main *bmain,
                               struct LightProbe *probe_dst,
diff --git a/source/blender/blenkernel/intern/lightprobe.c b/source/blender/blenkernel/intern/lightprobe.c
index 3a9c1c8ae1d..3cba3aa9611 100644
--- a/source/blender/blenkernel/intern/lightprobe.c
+++ b/source/blender/blenkernel/intern/lightprobe.c
@@ -41,7 +41,7 @@ void BKE_lightprobe_init(LightProbe *probe)
   MEMCPY_STRUCT_AFTER(probe, DNA_struct_default_get(LightProbe), id);
 }
 
-void BKE_lightprobe_configure(LightProbe *probe, const short lightprobe_type)
+void BKE_lightprobe_type_set(LightProbe *probe, const short lightprobe_type)
 {
   probe->type = lightprobe_type;
 
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 3cd957596f8..09a8af6333c 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -604,7 +604,7 @@ static int lightprobe_add_exec(bContext *C, wmOperator *op)
 
   probe = (LightProbe *)ob->data;
 
-  BKE_lightprobe_configure(probe, type);
+  BKE_lightprobe_type_set(probe, type);
 
   DEG_relations_tag_update(CTX_data_main(C));
 
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index cc11263ad5a..9df21a16e90 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -675,7 +675,7 @@ static LightProbe *rna_Main_lightprobe_new(Main *bmain, const char *name, int ty
 
   LightProbe *probe = BKE_lightprobe_add(bmain, safe_name);
 
-  BKE_lightprobe_configure(probe, type);
+  BKE_lightprobe_type_set(probe, type);
 
   id_us_min(&probe->id);
   return probe;



More information about the Bf-blender-cvs mailing list