RNA

* Added icon to property and enum property items. The latter is
  responsible for the large number of files changed.
* For RNA functions, added PROP_RNAPTR flag to ask for a PointerRNA
  as argument instead of a C pointer, instead of doing it implicitly
  with the AnyType type.

* Material: properly wrap diffuse/specular param variables, and
  rename some things for consistency.
* MaterialTextureSlot: added "enabled" property (ma->septex).
* Image: make animated property editable.
* Image Editor: make some things editable, notifiers, respect state.
* Context: fix issue with screen not being set as ID.

1 files changed, 33 insertions, 33 deletions

diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c
index 697efc88af1..9290e81a219 100644
--- a/source/blender/makesrna/intern/rna_world.c
+++ b/source/blender/makesrna/intern/rna_world.c
@@ -74,13 +74,13 @@ static void rna_def_world_mtex(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem texco_items[] = {
-		{TEXCO_VIEW, "VIEW", "View", "Uses view vector for the texture coordinates."},
-		{TEXCO_GLOB, "GLOBAL", "Global", "Uses global coordinates for the texture coordinates (interior mist)."},
-		{TEXCO_ANGMAP, "ANGMAP", "AngMap", "Uses 360 degree angular coordinates, e.g. for spherical light probes."},
-		{TEXCO_H_SPHEREMAP, "SPHERE", "Sphere", "For 360 degree panorama sky, spherical mapped, only top half."},
-		{TEXCO_H_TUBEMAP, "TUBE", "Tube", "For 360 degree panorama sky, cylindrical mapped, only top half."},
-		{TEXCO_OBJECT, "OBJECT", "Object", "Uses linked object's coordinates for texture coordinates."},
-		{0, NULL, NULL, NULL}};
+		{TEXCO_VIEW, "VIEW", 0, "View", "Uses view vector for the texture coordinates."},
+		{TEXCO_GLOB, "GLOBAL", 0, "Global", "Uses global coordinates for the texture coordinates (interior mist)."},
+		{TEXCO_ANGMAP, "ANGMAP", 0, "AngMap", "Uses 360 degree angular coordinates, e.g. for spherical light probes."},
+		{TEXCO_H_SPHEREMAP, "SPHERE", 0, "Sphere", "For 360 degree panorama sky, spherical mapped, only top half."},
+		{TEXCO_H_TUBEMAP, "TUBE", 0, "Tube", "For 360 degree panorama sky, cylindrical mapped, only top half."},
+		{TEXCO_OBJECT, "OBJECT", 0, "Object", "Uses linked object's coordinates for texture coordinates."},
+		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "WorldTextureSlot", "TextureSlot");
 	RNA_def_struct_sdna(srna, "MTex");
@@ -126,27 +126,27 @@ static void rna_def_ambient_occlusion(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem blend_mode_items[] = {
-		{WO_AOADD, "ADD", "Add", "Add light and shadow."},
-		{WO_AOSUB, "SUBTRACT", "Subtract", "Subtract light and shadow (needs a normal light to make anything visible.)"},
-		{WO_AOADDSUB, "BOTH", "Both", "Both lighten and darken."},
-		{0, NULL, NULL, NULL}};
+		{WO_AOADD, "ADD", 0, "Add", "Add light and shadow."},
+		{WO_AOSUB, "SUBTRACT", 0, "Subtract", "Subtract light and shadow (needs a normal light to make anything visible.)"},
+		{WO_AOADDSUB, "BOTH", 0, "Both", "Both lighten and darken."},
+		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem prop_color_items[] = {
-		{WO_AOPLAIN, "PLAIN", "White", "Plain diffuse energy (white.)"},
-		{WO_AOSKYCOL, "SKY_COLOR", "Sky Color", "Use horizon and zenith color for diffuse energy."},
-		{WO_AOSKYTEX, "SKY_TEXTURE", "Sky Texture", "Does full Sky texture render for diffuse energy."},
-		{0, NULL, NULL, NULL}};
+		{WO_AOPLAIN, "PLAIN", 0, "White", "Plain diffuse energy (white.)"},
+		{WO_AOSKYCOL, "SKY_COLOR", 0, "Sky Color", "Use horizon and zenith color for diffuse energy."},
+		{WO_AOSKYTEX, "SKY_TEXTURE", 0, "Sky Texture", "Does full Sky texture render for diffuse energy."},
+		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem prop_sample_method_items[] = {
-		{WO_AOSAMP_CONSTANT, "CONSTANT_JITTERED", "Constant Jittered", ""},
-		{WO_AOSAMP_HALTON, "ADAPTIVE_QMC", "Adaptive QMC", "Fast in high-contrast areas."},
-		{WO_AOSAMP_HAMMERSLEY, "CONSTANT_QMC", "Constant QMC", "Best quality."},
-		{0, NULL, NULL, NULL}};
+		{WO_AOSAMP_CONSTANT, "CONSTANT_JITTERED", 0, "Constant Jittered", ""},
+		{WO_AOSAMP_HALTON, "ADAPTIVE_QMC", 0, "Adaptive QMC", "Fast in high-contrast areas."},
+		{WO_AOSAMP_HAMMERSLEY, "CONSTANT_QMC", 0, "Constant QMC", "Best quality."},
+		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem prop_gather_method_items[] = {
-		{WO_AOGATHER_RAYTRACE, "RAYTRACE", "Raytrace", "Accurate, but slow when noise-free results are required."},
-		{WO_AOGATHER_APPROX, "APPROXIMATE", "Approximate", "Inaccurate, but faster and without noise."},
-		{0, NULL, NULL, NULL}};
+		{WO_AOGATHER_RAYTRACE, "RAYTRACE", 0, "Raytrace", "Accurate, but slow when noise-free results are required."},
+		{WO_AOGATHER_APPROX, "APPROXIMATE", 0, "Approximate", "Inaccurate, but faster and without noise."},
+		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "WorldAmbientOcclusion", NULL);
 	RNA_def_struct_sdna(srna, "World");
@@ -241,10 +241,10 @@ static void rna_def_world_mist(BlenderRNA *brna)
 	PropertyRNA *prop;
 	
 	static EnumPropertyItem falloff_items[] = {
-		{0, "QUADRATIC", "Quadratic", "Mist uses quadratic progression."},
-		{1, "LINEAR", "Linear", "Mist uses linear progression."},
-		{2, "INVERSE_QUADRATIC", "Inverse Quadratic", "Mist uses inverse quadratic progression."},
-		{0, NULL, NULL, NULL}};
+		{0, "QUADRATIC", 0, "Quadratic", "Mist uses quadratic progression."},
+		{1, "LINEAR", 0, "Linear", "Mist uses linear progression."},
+		{2, "INVERSE_QUADRATIC", 0, "Inverse Quadratic", "Mist uses inverse quadratic progression."},
+		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "WorldMistSettings", NULL);
 	RNA_def_struct_sdna(srna, "World");
@@ -335,13 +335,13 @@ void RNA_def_world(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem physics_engine_items[] = {
-		{WOPHY_NONE, "NONE", "None", ""},
-		//{WOPHY_ENJI, "ENJI", "Enji", ""},
-		{WOPHY_SUMO, "SUMO", "Sumo (Deprecated)", ""},
-		//{WOPHY_DYNAMO, "DYNAMO", "Dynamo", ""},
-		//{WOPHY_ODE, "ODE", "ODE", ""},
-		{WOPHY_BULLET, "BULLET", "Bullet", ""},
-		{0, NULL, NULL, NULL}};
+		{WOPHY_NONE, "NONE", 0, "None", ""},
+		//{WOPHY_ENJI, "ENJI", 0, "Enji", ""},
+		{WOPHY_SUMO, "SUMO", 0, "Sumo (Deprecated)", ""},
+		//{WOPHY_DYNAMO, "DYNAMO", 0, "Dynamo", ""},
+		//{WOPHY_ODE, "ODE", 0, "ODE", ""},
+		{WOPHY_BULLET, "BULLET", 0, "Bullet", ""},
+		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "World", "ID");
 	RNA_def_struct_ui_text(srna, "World", "World datablock describing the environment and ambient lighting of a scene.");