Rename probe to light-probe

Probe is a real general term, the new name is used often in docs online.

10 files changed, 53 insertions, 53 deletions

diff --git a/source/blender/blenkernel/BKE_probe.h b/source/blender/blenkernel/BKE_lightprobe.h
index 29e42e06113..ae7df75345d 100644
--- a/source/blender/blenkernel/BKE_probe.h
+++ b/source/blender/blenkernel/BKE_lightprobe.h
@@ -25,21 +25,21 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BKE_PROBE_H__
-#define __BKE_PROBE_H__
+#ifndef __BKE_LIGHTPROBE_H__
+#define __BKE_LIGHTPROBE_H__
 
-/** \file BKE_probe.h
+/** \file BKE_lightprobe.h
  *  \ingroup bke
  *  \brief General operations for probes.
  */
 
 struct Main;
-struct Probe;
+struct LightProbe;
 
-void BKE_probe_init(struct Probe *probe);
-void *BKE_probe_add(struct Main *bmain, const char *name);
-struct Probe *BKE_probe_copy(struct Main *bmain, struct Probe *probe);
-void BKE_probe_make_local(struct Main *bmain, struct Probe *probe, const bool lib_local);
-void BKE_probe_free(struct Probe *probe);
+void BKE_lightprobe_init(struct LightProbe *probe);
+void *BKE_lightprobe_add(struct Main *bmain, const char *name);
+struct LightProbe *BKE_lightprobe_copy(struct Main *bmain, struct LightProbe *probe);
+void BKE_lightprobe_make_local(struct Main *bmain, struct LightProbe *probe, const bool lib_local);
+void BKE_lightprobe_free(struct LightProbe *probe);
 
-#endif /* __BKE_PROBE_H__ */
+#endif /* __BKE_LIGHTPROBE_H__ */
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index 2f38eeb25df..faa91fd4f79 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -108,7 +108,7 @@ typedef struct Main {
 	ListBase vfont;
 	ListBase text;
 	ListBase speaker;
-	ListBase probe;
+	ListBase lightprobe;
 	ListBase sound;
 	ListBase group;
 	ListBase armature;
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index c1f80a1a976..66c71dcfab1 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -159,9 +159,9 @@ set(SRC
 	intern/pbvh.c
 	intern/pbvh_bmesh.c
 	intern/pointcache.c
-	intern/probe.c
 	intern/property.c
 	intern/layer.c
+	intern/lightprobe.c
 	intern/report.c
 	intern/rigidbody.c
 	intern/sca.c
@@ -281,9 +281,9 @@ set(SRC
 	BKE_particle.h
 	BKE_pbvh.h
 	BKE_pointcache.h
-	BKE_probe.h
 	BKE_property.h
 	BKE_layer.h
+	BKE_lightprobe.h
 	BKE_report.h
 	BKE_rigidbody.h
 	BKE_sca.h
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 585e5183608..e455b02fa6e 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -94,7 +94,7 @@ bool id_type_can_have_animdata(const short id_type)
 		case ID_MA: case ID_TE: case ID_NT:
 		case ID_LA: case ID_CA: case ID_WO:
 		case ID_LS:
-		case ID_PRB:
+		case ID_LP:
 		case ID_SPK:
 		case ID_SCE:
 		case ID_MC:
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c
index 315fc32502a..487635f06ad 100644
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -81,7 +81,7 @@ static IDType idtypes[] = {
 	{ ID_PA,   "ParticleSettings",   "particles",       BLT_I18NCONTEXT_ID_PARTICLESETTINGS,   IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_PAL,  "Palettes",           "palettes",        BLT_I18NCONTEXT_ID_PALETTE,            IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_PC,   "PaintCurve",         "paint_curves",    BLT_I18NCONTEXT_ID_PAINTCURVE,         IDTYPE_FLAGS_ISLINKABLE },
-	{ ID_PRB,  "Probe",              "probes",          BLT_I18NCONTEXT_ID_PROBE,              IDTYPE_FLAGS_ISLINKABLE },
+	{ ID_LP,   "LightProbe",         "light_probes",    BLT_I18NCONTEXT_ID_LIGHTPROBE,         IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_SCE,  "Scene",              "scenes",          BLT_I18NCONTEXT_ID_SCENE,              IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_SCR,  "Screen",             "screens",         BLT_I18NCONTEXT_ID_SCREEN,             IDTYPE_FLAGS_ISLINKABLE },
 	{ ID_SEQ,  "Sequence",           "sequences",       BLT_I18NCONTEXT_ID_SEQUENCE,           0                       }, /* not actually ID data */
@@ -205,7 +205,7 @@ int BKE_idcode_to_idfilter(const short idcode)
 		CASE_IDFILTER(PA);
 		CASE_IDFILTER(PAL);
 		CASE_IDFILTER(PC);
-		CASE_IDFILTER(PRB);
+		CASE_IDFILTER(LP);
 		CASE_IDFILTER(SCE);
 		CASE_IDFILTER(SPK);
 		CASE_IDFILTER(SO);
@@ -251,7 +251,7 @@ short BKE_idcode_from_idfilter(const int idfilter)
 		CASE_IDFILTER(PA);
 		CASE_IDFILTER(PAL);
 		CASE_IDFILTER(PC);
-		CASE_IDFILTER(PRB);
+		CASE_IDFILTER(LP);
 		CASE_IDFILTER(SCE);
 		CASE_IDFILTER(SPK);
 		CASE_IDFILTER(SO);
@@ -299,7 +299,7 @@ int BKE_idcode_to_index(const short idcode)
 		CASE_IDINDEX(PA);
 		CASE_IDINDEX(PAL);
 		CASE_IDINDEX(PC);
-		CASE_IDINDEX(PRB);
+		CASE_IDINDEX(LP);
 		CASE_IDINDEX(SCE);
 		CASE_IDINDEX(SCR);
 		CASE_IDINDEX(SPK);
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 7f7985ff990..04cd557e68a 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -62,7 +62,7 @@
 #include "DNA_mask_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
-#include "DNA_probe_types.h"
+#include "DNA_lightprobe_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_speaker_types.h"
@@ -118,7 +118,7 @@
 #include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_packedFile.h"
-#include "BKE_probe.h"
+#include "BKE_lightprobe.h"
 #include "BKE_sound.h"
 #include "BKE_speaker.h"
 #include "BKE_scene.h"
@@ -421,8 +421,8 @@ bool id_make_local(Main *bmain, ID *id, const bool test, const bool lib_local)
 		case ID_SPK:
 			if (!test) BKE_speaker_make_local(bmain, (Speaker *)id, lib_local);
 			return true;
-		case ID_PRB:
-			if (!test) BKE_probe_make_local(bmain, (Probe *)id, lib_local);
+		case ID_LP:
+			if (!test) BKE_lightprobe_make_local(bmain, (LightProbe *)id, lib_local);
 			return true;
 		case ID_WO:
 			if (!test) BKE_world_make_local(bmain, (World *)id, lib_local);
@@ -537,8 +537,8 @@ bool id_copy(Main *bmain, ID *id, ID **newid, bool test)
 		case ID_SPK:
 			if (!test) *newid = (ID *)BKE_speaker_copy(bmain, (Speaker *)id);
 			return true;
-		case ID_PRB:
-			if (!test) *newid = (ID *)BKE_probe_copy(bmain, (Probe *)id);
+		case ID_LP:
+			if (!test) *newid = (ID *)BKE_lightprobe_copy(bmain, (LightProbe *)id);
 			return true;
 		case ID_CA:
 			if (!test) *newid = (ID *)BKE_camera_copy(bmain, (Camera *)id);
@@ -677,8 +677,8 @@ ListBase *which_libbase(Main *mainlib, short type)
 			return &(mainlib->text);
 		case ID_SPK:
 			return &(mainlib->speaker);
-		case ID_PRB:
-			return &(mainlib->probe);
+		case ID_LP:
+			return &(mainlib->lightprobe);
 		case ID_SO:
 			return &(mainlib->sound);
 		case ID_GR:
@@ -849,7 +849,7 @@ int set_listbasepointers(Main *main, ListBase **lb)
 	lb[INDEX_ID_BR]  = &(main->brush);
 	lb[INDEX_ID_PA]  = &(main->particle);
 	lb[INDEX_ID_SPK] = &(main->speaker);
-	lb[INDEX_ID_PRB] = &(main->probe);
+	lb[INDEX_ID_LP]  = &(main->lightprobe);
 
 	lb[INDEX_ID_WO]  = &(main->world);
 	lb[INDEX_ID_MC]  = &(main->movieclip);
@@ -942,8 +942,8 @@ void *BKE_libblock_alloc_notest(short type)
 		case ID_SPK:
 			id = MEM_callocN(sizeof(Speaker), "speaker");
 			break;
-		case ID_PRB:
-			id = MEM_callocN(sizeof(Probe), "probe");
+		case ID_LP:
+			id = MEM_callocN(sizeof(LightProbe), "probe");
 			break;
 		case ID_SO:
 			id = MEM_callocN(sizeof(bSound), "sound");
@@ -1071,8 +1071,8 @@ void BKE_libblock_init_empty(ID *id)
 		case ID_SPK:
 			BKE_speaker_init((Speaker *)id);
 			break;
-		case ID_PRB:
-			BKE_probe_init((Probe *)id);
+		case ID_LP:
+			BKE_lightprobe_init((LightProbe *)id);
 			break;
 		case ID_CA:
 			BKE_camera_init((Camera *)id);
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index ef0ec4312f7..8a42a3334bd 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -52,7 +52,7 @@
 #include "DNA_mask_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_force.h"
-#include "DNA_probe_types.h"
+#include "DNA_lightprobe_types.h"
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_sensor_types.h"
@@ -772,9 +772,9 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call
 				break;
 			}
 
-			case ID_PRB:
+			case ID_LP:
 			{
-				Probe *probe = (Probe *) id;
+				LightProbe *probe = (LightProbe *) id;
 				CALLBACK_INVOKE(probe->image, IDWALK_CB_USER);
 				break;
 			}
@@ -1142,7 +1142,7 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
 			return ELEM(id_type_used, ID_MC);  /* WARNING! mask->parent.id, not typed. */
 		case ID_LS:
 			return (ELEM(id_type_used, ID_TE, ID_OB));
-		case ID_PRB:
+		case ID_LP:
 			return ELEM(id_type_used, ID_IM);
 		case ID_WS:
 		case ID_IM:
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index 23a2eaf4970..42dc1230586 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -53,7 +53,7 @@
 #include "DNA_mask_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
-#include "DNA_probe_types.h"
+#include "DNA_lightprobe_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_speaker_types.h"
@@ -100,7 +100,7 @@
 #include "BKE_object.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
-#include "BKE_probe.h"
+#include "BKE_lightprobe.h"
 #include "BKE_sca.h"
 #include "BKE_speaker.h"
 #include "BKE_sound.h"
@@ -840,8 +840,8 @@ void BKE_libblock_free_ex(Main *bmain, void *idv, const bool do_id_user, const b
 		case ID_SPK:
 			BKE_speaker_free((Speaker *)id);
 			break;
-		case ID_PRB:
-			BKE_probe_free((Probe *)id);
+		case ID_LP:
+			BKE_lightprobe_free((LightProbe *)id);
 			break;
 		case ID_SO:
 			BKE_sound_free((bSound *)id);
diff --git a/source/blender/blenkernel/intern/probe.c b/source/blender/blenkernel/intern/lightprobe.c
index 143ecb23875..e0e778725fc 100644
--- a/source/blender/blenkernel/intern/probe.c
+++ b/source/blender/blenkernel/intern/lightprobe.c
@@ -30,7 +30,7 @@
  */
 
 #include "DNA_object_types.h"
-#include "DNA_probe_types.h"
+#include "DNA_lightprobe_types.h"
 
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
@@ -38,9 +38,9 @@
 #include "BKE_animsys.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
-#include "BKE_probe.h"
+#include "BKE_lightprobe.h"
 
-void BKE_probe_init(Probe *probe)
+void BKE_lightprobe_init(LightProbe *probe)
 {
 	BLI_assert(MEMCMP_STRUCT_OFS_IS_ZERO(probe, id));
 
@@ -51,20 +51,20 @@ void BKE_probe_init(Probe *probe)
 	probe->clipend = 40.0f;
 }
 
-void *BKE_probe_add(Main *bmain, const char *name)
+void *BKE_lightprobe_add(Main *bmain, const char *name)
 {
-	Probe *probe;
+	LightProbe *probe;
 
-	probe =  BKE_libblock_alloc(bmain, ID_PRB, name);
+	probe =  BKE_libblock_alloc(bmain, ID_LP, name);
 
-	BKE_probe_init(probe);
+	BKE_lightprobe_init(probe);
 
 	return probe;
 }
 
-Probe *BKE_probe_copy(Main *bmain, Probe *probe)
+LightProbe *BKE_lightprobe_copy(Main *bmain, LightProbe *probe)
 {
-	Probe *probe_new;
+	LightProbe *probe_new;
 
 	probe_new = BKE_libblock_copy(bmain, &probe->id);
 
@@ -73,12 +73,12 @@ Probe *BKE_probe_copy(Main *bmain, Probe *probe)
 	return probe_new;
 }
 
-void BKE_probe_make_local(Main *bmain, Probe *probe, const bool lib_local)
+void BKE_lightprobe_make_local(Main *bmain, LightProbe *probe, const bool lib_local)
 {
 	BKE_id_make_local_generic(bmain, &probe->id, true, lib_local);
 }
 
-void BKE_probe_free(Probe *probe)
+void BKE_lightprobe_free(LightProbe *probe)
 {
 	BKE_animdata_free((ID *)probe, false);
 }
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 66c3f64f3d5..b1d2573f0e8 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -58,7 +58,7 @@
 #include "DNA_view3d_types.h"
 #include "DNA_world_types.h"
 #include "DNA_object_types.h"
-#include "DNA_probe_types.h"
+#include "DNA_lightprobe_types.h"
 #include "DNA_property_types.h"
 #include "DNA_rigidbody_types.h"
 
@@ -108,7 +108,7 @@
 #include "BKE_paint.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_probe.h"
+#include "BKE_lightprobe.h"
 #include "BKE_property.h"
 #include "BKE_rigidbody.h"
 #include "BKE_sca.h"
@@ -604,7 +604,7 @@ void *BKE_object_obdata_add_from_type(Main *bmain, int type, const char *name)
 		case OB_LATTICE:   return BKE_lattice_add(bmain, name);
 		case OB_ARMATURE:  return BKE_armature_add(bmain, name);
 		case OB_SPEAKER:   return BKE_speaker_add(bmain, name);
-		case OB_PROBE:     return BKE_probe_add(bmain, name);
+		case OB_LIGHTPROBE:return BKE_lightprobe_add(bmain, name);
 		case OB_EMPTY:     return NULL;
 		default:
 			printf("%s: Internal error, bad type: %d\n", __func__, type);