RNA

* PROP_NEVER_NULL is now a flag instead of a subtype.
* It works for function parameters too now, so setting
  this flag can help avoid NULL checks in the function.
* Renamed LocalLamp to PointLamp, making it consistent
  with the UI name.
* Set icons for the different lamp struct types.

1 files changed, 6 insertions, 3 deletions

diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c
index d2eebbc61aa..c6068d0a650 100644
--- a/source/blender/makesrna/intern/rna_world.c
+++ b/source/blender/makesrna/intern/rna_world.c
@@ -461,17 +461,20 @@ void RNA_def_world(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_WORLD, NULL);
 
 	/* nested structs */
-	prop= RNA_def_property(srna, "ambient_occlusion", PROP_POINTER, PROP_NEVER_NULL);
+	prop= RNA_def_property(srna, "ambient_occlusion", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_NEVER_NULL);
 	RNA_def_property_struct_type(prop, "WorldAmbientOcclusion");
 	RNA_def_property_pointer_funcs(prop, "rna_World_ambient_occlusion_get", NULL, NULL);
 	RNA_def_property_ui_text(prop, "Ambient Occlusion", "World ambient occlusion settings.");
 
-	prop= RNA_def_property(srna, "mist", PROP_POINTER, PROP_NEVER_NULL);
+	prop= RNA_def_property(srna, "mist", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_NEVER_NULL);
 	RNA_def_property_struct_type(prop, "WorldMistSettings");
 	RNA_def_property_pointer_funcs(prop, "rna_World_mist_get", NULL, NULL);
 	RNA_def_property_ui_text(prop, "Mist", "World mist settings.");
 
-	prop= RNA_def_property(srna, "stars", PROP_POINTER, PROP_NEVER_NULL);
+	prop= RNA_def_property(srna, "stars", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_NEVER_NULL);
 	RNA_def_property_struct_type(prop, "WorldStarsSettings");
 	RNA_def_property_pointer_funcs(prop, "rna_World_stars_get", NULL, NULL);
 	RNA_def_property_ui_text(prop, "Stars", "World stars settings.");