Rename probe to light-probe

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

4 files changed, 27 insertions, 27 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 0fa8b4b2e9d..ed29f2336de 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -266,7 +266,7 @@ typedef enum ID_Type {
 	ID_PC   = MAKE_ID2('P', 'C'), /* PaintCurve  */
 	ID_CF   = MAKE_ID2('C', 'F'), /* CacheFile */
 	ID_WS   = MAKE_ID2('W', 'S'), /* WorkSpace */
-	ID_PRB  = MAKE_ID2('P', 'R'), /* Probe */
+	ID_LP   = MAKE_ID2('L', 'P'), /* LightProbe */
 } ID_Type;
 
 /* Only used as 'placeholder' in .blend files for directly linked datablocks. */
@@ -401,7 +401,7 @@ enum {
 	FILTER_ID_PA        = (1 << 27),
 	FILTER_ID_CF        = (1 << 28),
 	FILTER_ID_WS        = (1 << 29),
-	FILTER_ID_PRB       = (1 << 30),
+	FILTER_ID_LP        = (1 << 31),
 };
 
 /* IMPORTANT: this enum matches the order currently use in set_listbasepointers,
@@ -433,7 +433,7 @@ enum {
 	INDEX_ID_BR,
 	INDEX_ID_PA,
 	INDEX_ID_SPK,
-	INDEX_ID_PRB,
+	INDEX_ID_LP,
 	INDEX_ID_WO,
 	INDEX_ID_MC,
 	INDEX_ID_SCR,
diff --git a/source/blender/makesdna/DNA_probe_types.h b/source/blender/makesdna/DNA_lightprobe_types.h
index 88a1ba9078f..559b02f5497 100644
--- a/source/blender/makesdna/DNA_probe_types.h
+++ b/source/blender/makesdna/DNA_lightprobe_types.h
@@ -21,12 +21,12 @@
  *
  */
 
-/** \file DNA_probe_types.h
+/** \file DNA_lightprobe_types.h
  *  \ingroup DNA
  */
 
-#ifndef __DNA_PROBE_TYPES_H__
-#define __DNA_PROBE_TYPES_H__
+#ifndef __DNA_LIGHTPROBE_TYPES_H__
+#define __DNA_LIGHTPROBE_TYPES_H__
 
 #include "DNA_defs.h"
 #include "DNA_listBase.h"
@@ -39,7 +39,7 @@ extern "C" {
 struct Object;
 struct AnimData;
 
-typedef struct Probe {
+typedef struct LightProbe {
 	ID id;
 	struct AnimData *adt;		/* animation data (must be immediately after id for utilities to use it) */
 
@@ -60,39 +60,39 @@ typedef struct Probe {
 	/* Runtime display data */
 	float distfalloff, pad;
 	float clipmat[6][4][4];
-} Probe;
+} LightProbe;
 
 /* Probe->type */
 enum {
-	PROBE_CUBE      = 0,
-	PROBE_PLANAR    = 1,
-	PROBE_IMAGE     = 2,
+	LIGHTPROBE_TYPE_CUBE      = 0,
+	LIGHTPROBE_TYPE_PLANAR    = 1,
+	LIGHTPROBE_TYPE_IMAGE     = 2,
 };
 
 /* Probe->flag */
 enum {
-	PRB_CUSTOM_PARALLAX = (1 << 0),
-	PRB_SHOW_INFLUENCE  = (1 << 1),
-	PRB_SHOW_PARALLAX   = (1 << 2),
-	PRB_SHOW_CLIP_DIST  = (1 << 3),
+	LIGHTPROBE_FLAG_CUSTOM_PARALLAX = (1 << 0),
+	LIGHTPROBE_FLAG_SHOW_INFLUENCE  = (1 << 1),
+	LIGHTPROBE_FLAG_SHOW_PARALLAX   = (1 << 2),
+	LIGHTPROBE_FLAG_SHOW_CLIP_DIST  = (1 << 3),
 };
 
 /* Probe->display */
 enum {
-	PROBE_WIRE         = 0,
-	PROBE_SHADED       = 1,
-	PROBE_DIFFUSE      = 2,
-	PROBE_REFLECTIVE   = 3,
+	LIGHTPROBE_DISP_WIRE         = 0,
+	LIGHTPROBE_DISP_SHADED       = 1,
+	LIGHTPROBE_DISP_DIFFUSE      = 2,
+	LIGHTPROBE_DISP_REFLECTIVE   = 3,
 };
 
 /* Probe->parallax && Probe->attenuation_type*/
 enum {
-	PROBE_ELIPSOID   = 0,
-	PROBE_BOX        = 1,
+	LIGHTPROBE_SHAPE_ELIPSOID   = 0,
+	LIGHTPROBE_SHAPE_BOX        = 1,
 };
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __DNA_PROBE_TYPES_H__ */
+#endif /* __DNA_LIGHTPROBE_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index a747bba8e12..8ec5e4d763d 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -385,7 +385,7 @@ enum {
 	OB_CAMERA     = 11,
 
 	OB_SPEAKER    = 12,
-	OB_PROBE      = 13,
+	OB_LIGHTPROBE = 13,
 
 /*	OB_WAVE       = 21, */
 	OB_LATTICE    = 22,
@@ -406,10 +406,10 @@ enum {
 
 /* is this ID type used as object data */
 #define OB_DATA_SUPPORT_ID(_id_type) \
-	(ELEM(_id_type, ID_ME, ID_CU, ID_MB, ID_LA, ID_SPK, ID_PRB, ID_CA, ID_LT, ID_AR))
+	(ELEM(_id_type, ID_ME, ID_CU, ID_MB, ID_LA, ID_SPK, ID_LP, ID_CA, ID_LT, ID_AR))
 
 #define OB_DATA_SUPPORT_ID_CASE \
-	ID_ME: case ID_CU: case ID_MB: case ID_LA: case ID_SPK: case ID_PRB: case ID_CA: case ID_LT: case ID_AR
+	ID_ME: case ID_CU: case ID_MB: case ID_LA: case ID_SPK: case ID_LP: case ID_CA: case ID_LT: case ID_AR
 
 /* partype: first 4 bits: type */
 enum {
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index fe576e2ab70..c39e63ff8a5 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -136,7 +136,7 @@ static const char *includefiles[] = {
 	"DNA_cachefile_types.h",
 	"DNA_layer_types.h",
 	"DNA_workspace_types.h",
-	"DNA_probe_types.h",
+	"DNA_lightprobe_types.h",
 
 	/* see comment above before editing! */
 
@@ -1364,6 +1364,6 @@ int main(int argc, char **argv)
 #include "DNA_cachefile_types.h"
 #include "DNA_layer_types.h"
 #include "DNA_workspace_types.h"
-#include "DNA_probe_types.h"
+#include "DNA_lightprobe_types.h"
 
 /* end of list */