[Bf-blender-cvs] [f52dc2f3719] blender2.8: Rename probe to light-probe
Campbell Barton
noreply at git.blender.org
Mon Jun 12 13:33:27 CEST 2017
Commit: f52dc2f371923c22a974df7105245f7e0b8148ee
Author: Campbell Barton
Date: Mon Jun 12 20:59:54 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBf52dc2f371923c22a974df7105245f7e0b8148ee
Rename probe to light-probe
Probe is a real general term, the new name is used often in docs online.
===================================================================
M release/scripts/startup/bl_ui/__init__.py
R085 release/scripts/startup/bl_ui/properties_data_probe.py release/scripts/startup/bl_ui/properties_data_lightprobe.py
M release/scripts/startup/bl_ui/properties_texture.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/CMakeLists.txt
R068 source/blender/blenkernel/BKE_probe.h source/blender/blenkernel/BKE_lightprobe.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/idcode.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/library_remap.c
R077 source/blender/blenkernel/intern/probe.c source/blender/blenkernel/intern/lightprobe.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/blentranslation/BLT_translation.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/clay/clay_engine.c
M source/blender/draw/engines/eevee/eevee_data.c
M source/blender/draw/engines/eevee/eevee_effects.c
M source/blender/draw/engines/eevee/eevee_engine.c
R082 source/blender/draw/engines/eevee/eevee_probes.c source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/eevee/eevee_private.h
R100 source/blender/draw/engines/eevee/shaders/probe_filter_frag.glsl source/blender/draw/engines/eevee/shaders/lightprobe_filter_frag.glsl
R100 source/blender/draw/engines/eevee/shaders/probe_geom.glsl source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl
R100 source/blender/draw/engines/eevee/shaders/probe_sh_frag.glsl source/blender/draw/engines/eevee/shaders/lightprobe_sh_frag.glsl
R100 source/blender/draw/engines/eevee/shaders/probe_vert.glsl source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/modes/object_mode.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_intern.h
M source/blender/editors/object/object_ops.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_file/filesel.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/makesdna/DNA_ID.h
R073 source/blender/makesdna/DNA_probe_types.h source/blender/makesdna/DNA_lightprobe_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/intern/makesdna.c
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_internal.h
R076 source/blender/makesrna/intern/rna_probe.c source/blender/makesrna/intern/rna_lightprobe.c
M source/blender/makesrna/intern/rna_main.c
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_texture.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index d1984649624..cc3d1ffc229 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -40,7 +40,7 @@ _modules = [
"properties_data_mesh",
"properties_data_metaball",
"properties_data_modifier",
- "properties_data_probe",
+ "properties_data_lightprobe",
"properties_data_speaker",
"properties_game",
"properties_mask_common",
diff --git a/release/scripts/startup/bl_ui/properties_data_probe.py b/release/scripts/startup/bl_ui/properties_data_lightprobe.py
similarity index 85%
rename from release/scripts/startup/bl_ui/properties_data_probe.py
rename to release/scripts/startup/bl_ui/properties_data_lightprobe.py
index 794ec0c3cbd..5c5f4c3365f 100644
--- a/release/scripts/startup/bl_ui/properties_data_probe.py
+++ b/release/scripts/startup/bl_ui/properties_data_lightprobe.py
@@ -29,10 +29,10 @@ class DataButtonsPanel:
@classmethod
def poll(cls, context):
engine = context.scene.render.engine
- return context.probe and (engine in cls.COMPAT_ENGINES)
+ return context.lightprobe and (engine in cls.COMPAT_ENGINES)
-class DATA_PT_context_probe(DataButtonsPanel, Panel):
+class DATA_PT_context_lightprobe(DataButtonsPanel, Panel):
bl_label = ""
bl_options = {'HIDE_HEADER'}
COMPAT_ENGINES = {'BLENDER_CLAY', 'BLENDER_EEVEE'}
@@ -41,7 +41,7 @@ class DATA_PT_context_probe(DataButtonsPanel, Panel):
layout = self.layout
ob = context.object
- probe = context.probe
+ probe = context.lightprobe
space = context.space_data
if ob:
@@ -50,7 +50,7 @@ class DATA_PT_context_probe(DataButtonsPanel, Panel):
layout.template_ID(space, "pin_id")
-class DATA_PT_probe(DataButtonsPanel, Panel):
+class DATA_PT_lightprobe(DataButtonsPanel, Panel):
bl_label = "Probe"
COMPAT_ENGINES = {'BLENDER_CLAY', 'BLENDER_EEVEE'}
@@ -58,7 +58,7 @@ class DATA_PT_probe(DataButtonsPanel, Panel):
layout = self.layout
ob = context.object
- probe = context.probe
+ probe = context.lightprobe
layout.prop(probe, "type", expand=True)
@@ -81,7 +81,7 @@ class DATA_PT_probe(DataButtonsPanel, Panel):
col.prop(probe, "clip_end", text="End")
-class DATA_PT_parallax(DataButtonsPanel, Panel):
+class DATA_PT_lightprobe_parallax(DataButtonsPanel, Panel):
bl_label = "Parallax"
COMPAT_ENGINES = {'BLENDER_CLAY', 'BLENDER_EEVEE'}
@@ -89,7 +89,7 @@ class DATA_PT_parallax(DataButtonsPanel, Panel):
layout = self.layout
ob = context.object
- probe = context.probe
+ probe = context.lightprobe
layout.prop(probe, "use_custom_parallax")
@@ -105,7 +105,7 @@ class DATA_PT_parallax(DataButtonsPanel, Panel):
col.prop(probe, "parallax_distance", "Size")
-class DATA_PT_display(DataButtonsPanel, Panel):
+class DATA_PT_lightprobe_display(DataButtonsPanel, Panel):
bl_label = "Display"
COMPAT_ENGINES = {'BLENDER_CLAY', 'BLENDER_EEVEE'}
@@ -113,7 +113,7 @@ class DATA_PT_display(DataButtonsPanel, Panel):
layout = self.layout
ob = context.object
- probe = context.probe
+ probe = context.lightprobe
split = layout.split()
@@ -128,10 +128,10 @@ class DATA_PT_display(DataButtonsPanel, Panel):
classes = (
- DATA_PT_context_probe,
- DATA_PT_probe,
- DATA_PT_parallax,
- DATA_PT_display,
+ DATA_PT_context_lightprobe,
+ DATA_PT_lightprobe,
+ DATA_PT_lightprobe_parallax,
+ DATA_PT_lightprobe_display,
)
if __name__ == "__main__": # only for live edit.
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index a9857a618c8..d309b909f92 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -459,7 +459,7 @@ def texture_filter_common(tex, layout):
layout.prop(tex, "filter_type", text="")
if tex.use_mipmap and tex.filter_type in {'AREA', 'EWA', 'FELINE'}:
if tex.filter_type == 'FELINE':
- layout.prop(tex, "filter_probes", text="Probes")
+ layout.prop(tex, "filter_lightprobes", text="Light Probes")
else:
layout.prop(tex, "filter_eccentricity", text="Eccentricity")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 080b92bdccc..a6bd29d19cf 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1205,15 +1205,15 @@ class INFO_MT_lamp_add(Menu):
layout.operator_enum("object.lamp_add", "type")
-class INFO_MT_probe_add(Menu):
- bl_idname = "INFO_MT_probe_add"
- bl_label = "Probe"
+class INFO_MT_lightprobe_add(Menu):
+ bl_idname = "INFO_MT_lightprobe_add"
+ bl_label = "Light Probe"
def draw(self, context):
layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN'
- layout.operator_enum("object.probe_add", "type")
+ layout.operator_enum("object.lightprobe_add", "type")
class INFO_MT_camera_add(Menu):
@@ -1263,7 +1263,7 @@ class INFO_MT_add(Menu):
INFO_MT_camera_add.draw(self, context)
layout.menu("INFO_MT_lamp_add", icon='OUTLINER_OB_LAMP')
- layout.menu("INFO_MT_probe_add")
+ layout.menu("INFO_MT_lightprobe_add")
layout.separator()
layout.operator_menu_enum("object.effector_add", "type", text="Force Field", icon='OUTLINER_OB_EMPTY')
@@ -3787,7 +3787,7 @@ classes = (
INFO_MT_edit_armature_add,
INFO_MT_armature_add,
INFO_MT_lamp_add,
- INFO_MT_probe_add,
+ INFO_MT_lightprobe_add,
INFO_MT_camera_add,
INFO_MT_add,
VIEW3D_MT_object,
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 9c392993e58..b46d3a3e64c 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -55,6 +55,7 @@ set(SRC_DNA_INC
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lamp_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_layer_types.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lightprobe_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_manipulator_types.h
@@ -71,7 +72,6 @@ set(SRC_DNA_INC
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_outliner_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_packedFile_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_particle_types.h
- ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_probe_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_property_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_rigidbody_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_scene_types.h
diff --git a/source/blender/blenkernel/BKE_probe.h b/source/blender/blenkernel/BKE_lightprobe.h
similarity index 68%
rename from source/blender/blenkernel/BKE_probe.h
rename to 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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list