[Bf-blender-cvs] [66577c8732f] blender2.8: Rename EEVEE visibility group > collection

[Dalai Felinto]

Commit: 66577c8732f4957e4afa5cafb18259ea589e74b6
Author: Dalai Felinto
Date:   Mon May 28 21:27:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB66577c8732f4957e4afa5cafb18259ea589e74b6

Rename EEVEE visibility group > collection

I think we should rename the DNA as well, and break the 0.01 files using this feature.
But I will leave this decision to Clement.

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

M	release/scripts/startup/bl_ui/properties_data_lightprobe.py
M	source/blender/draw/engines/eevee/eevee_private.h
M	source/blender/makesrna/intern/rna_lightprobe.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_lightprobe.py b/release/scripts/startup/bl_ui/properties_data_lightprobe.py
index 89bf040dabf..c56d40df906 100644
--- a/release/scripts/startup/bl_ui/properties_data_lightprobe.py
+++ b/release/scripts/startup/bl_ui/properties_data_lightprobe.py
@@ -111,10 +111,10 @@ class DATA_PT_lightprobe(DataButtonsPanel, Panel):
 
         col.separator()
 
-        col.label("Visibility Group:")
+        col.label("Visibility Collection:")
         row = col.row(align=True)
-        row.prop(probe, "visibility_group", text="")
-        row.prop(probe, "invert_visibility_group", text="", icon='ARROW_LEFTRIGHT')
+        row.prop(probe, "visibility_collection", text="")
+        row.prop(probe, "invert_visibility_collection", text="", icon='ARROW_LEFTRIGHT')
 
 
 class DATA_PT_lightprobe_parallax(DataButtonsPanel, Panel):
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 342f0331a0c..10a53db5e35 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -466,7 +466,7 @@ typedef struct EEVEE_LightProbesInfo {
 	struct EEVEE_LightProbe probe_data[MAX_PROBE];
 	struct EEVEE_LightGrid grid_data[MAX_GRID];
 	struct EEVEE_PlanarReflection planar_data[MAX_PLANAR];
-	/* Probe Visibility Group */
+	/* Probe Visibility Collection */
 	EEVEE_LightProbeVisTest vis_data;
 } EEVEE_LightProbesInfo;
 
diff --git a/source/blender/makesrna/intern/rna_lightprobe.c b/source/blender/makesrna/intern/rna_lightprobe.c
index d4b94bfb3be..f3091ae5ee1 100644
--- a/source/blender/makesrna/intern/rna_lightprobe.c
+++ b/source/blender/makesrna/intern/rna_lightprobe.c
@@ -187,17 +187,17 @@ static void rna_def_lightprobe(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Intensity", "Modify the intensity of the lighting captured by this probe");
 	RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, "rna_LightProbe_recalc");
 
-	prop = RNA_def_property(srna, "visibility_group", PROP_POINTER, PROP_NONE);
+	prop = RNA_def_property(srna, "visibility_collection", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(prop, "Collection");
 	RNA_def_property_pointer_sdna(prop, NULL, "visibility_grp");
 	RNA_def_property_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Visibility Collection", "Restrict objects visible for this probe");
 	RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, "rna_LightProbe_recalc");
 
-	prop = RNA_def_property(srna, "invert_visibility_group", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "invert_visibility_collection", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", LIGHTPROBE_FLAG_INVERT_GROUP);
 	RNA_def_property_flag(prop, PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Invert Group", "Invert visibility group");
+	RNA_def_property_ui_text(prop, "Invert Collection", "Invert visibility collection");
 	RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, "rna_LightProbe_recalc");
 
 	/* Data preview */