Rename probe to light-probe

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

9 files changed, 31 insertions, 31 deletions

diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 720016428d2..2548951cb88 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1359,7 +1359,7 @@ int UI_idcode_icon_get(const int idcode)
 			return ICON_COLOR;  /* TODO! this would need its own icon! */
 		case ID_PC:
 			return ICON_CURVE_BEZCURVE;  /* TODO! this would need its own icon! */
-		case ID_PRB:
+		case ID_LP:
 			return ICON_RADIO;
 		case ID_SCE:
 			return ICON_SCENE_DATA;
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index a4152e72237..083e29ac28b 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -451,7 +451,7 @@ static const char *template_id_browse_tip(const StructRNA *type)
 			case ID_PC:  return N_("Browse Paint Curve Data to be linked");
 			case ID_CF:  return N_("Browse Cache Files to be linked");
 			case ID_WS:  return N_("Browse Workspace to be linked");
-			case ID_PRB: return N_("Browse Probe to be linked");
+			case ID_LP:  return N_("Browse LightProbe to be linked");
 		}
 	}
 	return N_("Browse ID data to be linked");
@@ -590,7 +590,7 @@ static void template_ID(
 		                                 BLT_I18NCONTEXT_ID_GPENCIL,
 		                                 BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE,
 		                                 BLT_I18NCONTEXT_ID_WORKSPACE,
-		                                 BLT_I18NCONTEXT_ID_PROBE,
+		                                 BLT_I18NCONTEXT_ID_LIGHTPROBE,
 		);
 		
 		if (newop) {
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 411f8eb7347..2649a6d6d69 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -45,7 +45,7 @@
 #include "DNA_object_fluidsim.h"
 #include "DNA_object_force.h"
 #include "DNA_object_types.h"
-#include "DNA_probe_types.h"
+#include "DNA_lightprobe_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_vfont_types.h"
 #include "DNA_actuator_types.h"
@@ -152,11 +152,11 @@ static EnumPropertyItem field_type_items[] = {
 	{0, NULL, 0, NULL, NULL}
 };
 
-/* copy from rna_probe.c */
-static EnumPropertyItem probe_type_items[] = {
-	{PROBE_CUBE, "CUBE", ICON_MESH_UVSPHERE, "Sphere", ""},
-	// {PROBE_PLANAR, "PLANAR", ICON_MESH_PLANE, "Planar", ""},
-	// {PROBE_IMAGE, "IMAGE", ICON_NONE, "Image", ""},
+/* copy from rna_lightprobe.c */
+static EnumPropertyItem lightprobe_type_items[] = {
+	{LIGHTPROBE_TYPE_CUBE, "CUBE", ICON_MESH_UVSPHERE, "Sphere", ""},
+	// {LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_MESH_PLANE, "Planar", ""},
+	// {LIGHTPROBE_TYPE_IMAGE, "IMAGE", ICON_NONE, "Image", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -512,10 +512,10 @@ void OBJECT_OT_add(wmOperatorType *ot)
 /********************** Add Probe Operator **********************/
 
 /* for object add operator */
-static int probe_add_exec(bContext *C, wmOperator *op)
+static int lightprobe_add_exec(bContext *C, wmOperator *op)
 {
 	Object *ob;
-	Probe *probe;
+	LightProbe *probe;
 	int type;
 	bool enter_editmode;
 	unsigned int layer;
@@ -529,11 +529,11 @@ static int probe_add_exec(bContext *C, wmOperator *op)
 	type = RNA_enum_get(op->ptr, "type");
 	dia = RNA_float_get(op->ptr, "radius");
 
-	const char *name = CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Probe");
-	ob = ED_object_add_type(C, OB_PROBE, name, loc, rot, false, layer);
+	const char *name = CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "LightProbe");
+	ob = ED_object_add_type(C, OB_LIGHTPROBE, name, loc, rot, false, layer);
 	BKE_object_obdata_size_init(ob, dia);
 
-	probe = (Probe *)ob->data;
+	probe = (LightProbe *)ob->data;
 	probe->type = type;
 
 	DEG_relations_tag_update(CTX_data_main(C));
@@ -541,22 +541,22 @@ static int probe_add_exec(bContext *C, wmOperator *op)
 	return OPERATOR_FINISHED;
 }
 
-void OBJECT_OT_probe_add(wmOperatorType *ot)
+void OBJECT_OT_lightprobe_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Add Probe";
-	ot->description = "Add a probe object";
-	ot->idname = "OBJECT_OT_probe_add";
+	ot->name = "Add Light Probe";
+	ot->description = "Add a light probe object";
+	ot->idname = "OBJECT_OT_lightprobe_add";
 
 	/* api callbacks */
-	ot->exec = probe_add_exec;
+	ot->exec = lightprobe_add_exec;
 	ot->poll = ED_operator_objectmode;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
 	/* properties */
-	ot->prop = RNA_def_enum(ot->srna, "type", probe_type_items, 0, "Type", "");
+	ot->prop = RNA_def_enum(ot->srna, "type", lightprobe_type_items, 0, "Type", "");
 
 	ED_object_add_unit_props(ot);
 	ED_object_add_generic_props(ot, true);
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index a03bb17dc2a..f6fb3cc75b8 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -112,7 +112,7 @@ void OBJECT_OT_metaball_add(struct wmOperatorType *ot);
 void OBJECT_OT_text_add(struct wmOperatorType *ot);
 void OBJECT_OT_armature_add(struct wmOperatorType *ot);
 void OBJECT_OT_empty_add(struct wmOperatorType *ot);
-void OBJECT_OT_probe_add(struct wmOperatorType *ot);
+void OBJECT_OT_lightprobe_add(struct wmOperatorType *ot);
 void OBJECT_OT_drop_named_image(struct wmOperatorType *ot);
 void OBJECT_OT_lamp_add(struct wmOperatorType *ot);
 void OBJECT_OT_effector_add(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 8e50db725e3..ca02457ba39 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -107,7 +107,7 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_text_add);
 	WM_operatortype_append(OBJECT_OT_armature_add);
 	WM_operatortype_append(OBJECT_OT_empty_add);
-	WM_operatortype_append(OBJECT_OT_probe_add);
+	WM_operatortype_append(OBJECT_OT_lightprobe_add);
 	WM_operatortype_append(OBJECT_OT_drop_named_image);
 	WM_operatortype_append(OBJECT_OT_lamp_add);
 	WM_operatortype_append(OBJECT_OT_camera_add);
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 6dce22d8553..2460ba3fc9f 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -211,7 +211,7 @@ static int buttons_context_path_data(ButsContextPath *path, int type)
 	else if (RNA_struct_is_a(ptr->type, &RNA_Camera) && (type == -1 || type == OB_CAMERA)) return 1;
 	else if (RNA_struct_is_a(ptr->type, &RNA_Lamp) && (type == -1 || type == OB_LAMP)) return 1;
 	else if (RNA_struct_is_a(ptr->type, &RNA_Speaker) && (type == -1 || type == OB_SPEAKER)) return 1;
-	else if (RNA_struct_is_a(ptr->type, &RNA_Probe) && (type == -1 || type == OB_PROBE)) return 1;
+	else if (RNA_struct_is_a(ptr->type, &RNA_LightProbe) && (type == -1 || type == OB_LIGHTPROBE)) return 1;
 	/* try to get an object in the path, no pinning supported here */
 	else if (buttons_context_path_object(path)) {
 		ob = path->ptr[path->len - 1].data;
@@ -779,7 +779,7 @@ void buttons_context_compute(const bContext *C, SpaceButs *sbuts)
 
 const char *buttons_context_dir[] = {
 	"texture_slot", "scene", "world", "object", "mesh", "armature", "lattice", "curve",
-	"meta_ball", "lamp", "speaker", "probe", "camera", "material", "material_slot",
+	"meta_ball", "lamp", "speaker", "lightprobe", "camera", "material", "material_slot",
 	"texture", "texture_user", "texture_user_property", "bone", "edit_bone",
 	"pose_bone", "particle_system", "particle_system_editable", "particle_settings",
 	"cloth", "soft_body", "fluid", "smoke", "collision", "brush", "dynamic_paint",
@@ -848,8 +848,8 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 		set_pointer_type(path, result, &RNA_Speaker);
 		return 1;
 	}
-	else if (CTX_data_equals(member, "probe")) {
-		set_pointer_type(path, result, &RNA_Probe);
+	else if (CTX_data_equals(member, "lightprobe")) {
+		set_pointer_type(path, result, &RNA_LightProbe);
 		return 1;
 	}
 	else if (CTX_data_equals(member, "material")) {
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index c338e91b117..3dfeb5eb5b3 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -216,7 +216,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 		                    FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME | FILTER_ID_MSK | FILTER_ID_NT | FILTER_ID_OB |
 		                    FILTER_ID_PA | FILTER_ID_PAL | FILTER_ID_PC | FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO |
 		                    FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_WO | FILTER_ID_CF | FILTER_ID_WS |
-		                    FILTER_ID_PRB;
+		                    FILTER_ID_LP;
 
 		if (U.uiflag & USER_HIDE_DOT) {
 			params->flag |= FILE_HIDE_DOT;
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 0653367561f..f046e1c3176 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -108,7 +108,7 @@ typedef struct TreeElement {
 
 #define TREESTORE_ID_TYPE(_id) \
 	(ELEM(GS((_id)->name), ID_SCE, ID_LI, ID_OB, ID_ME, ID_CU, ID_MB, ID_NT, ID_MA, ID_TE, ID_IM, ID_LT, ID_LA, ID_CA) || \
-	 ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS, ID_PRB) || \
+	 ELEM(GS((_id)->name), ID_KE, ID_WO, ID_SPK, ID_GR, ID_AR, ID_AC, ID_BR, ID_PA, ID_GD, ID_LS, ID_LP) || \
 	 ELEM(GS((_id)->name), ID_SCR, ID_WM, ID_TXT, ID_VF, ID_SO, ID_CF, ID_PAL, ID_WS))  /* Only in 'blendfile' mode ... :/ */
 
 /* TreeElement->flag */
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 15bac69b6bd..b91ed13370d 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -46,7 +46,7 @@
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
-#include "DNA_probe_types.h"
+#include "DNA_lightprobe_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_world_types.h"
@@ -731,9 +731,9 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
 				outliner_add_element(soops, &te->subtree, spk, te, TSE_ANIM_DATA, 0);
 			break;
 		}
-		case ID_PRB:
+		case ID_LP:
 		{
-			Probe *prb = (Probe *)id;
+			LightProbe *prb = (LightProbe *)id;
 
 			if (outliner_animdata_test(prb->adt))
 				outliner_add_element(soops, &te->subtree, prb, te, TSE_ANIM_DATA, 0);