Small RNA changes

* rna_validate_identifier now checks identifiers are not python keywords such as if, and, from (builtins like max, object and sort are ok)
* rna_validate_identifier prints an error explaining why it fails
* renamed Struct's "from" to "base" - to point to the struct inherited from.
* renamed ImageUsers's "pass" and "layer" to "renderPass" and "renderLayer"
* use the identifier as the key for ENUM's (matching structs and properties)

1 files changed, 4 insertions, 2 deletions

diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index 2a41961ca00..07e0e2c2bd6 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -72,11 +72,13 @@ static void rna_def_imageuser(BlenderRNA *brna)
 	RNA_def_property_range(prop, -MAXFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Fields per Frame", "The number of fields per rendered frame (2 fields is 1 image).");
 
-	prop= RNA_def_property(srna, "layer", PROP_INT, PROP_UNSIGNED);
+	prop= RNA_def_property(srna, "renderLayer", PROP_INT, PROP_UNSIGNED);
+	RNA_def_property_int_sdna(prop, NULL, "layer");
 	RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* image_multi_cb */
 	RNA_def_property_ui_text(prop, "Layer", "Layer in multilayer image.");
 
-	prop= RNA_def_property(srna, "pass", PROP_INT, PROP_UNSIGNED);
+	prop= RNA_def_property(srna, "renderPass", PROP_INT, PROP_UNSIGNED);
+	RNA_def_property_int_sdna(prop, NULL, "pass");
 	RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* image_multi_cb */
 	RNA_def_property_ui_text(prop, "Pass", "Pass in multilayer image.");
 }