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, 26 insertions, 26 deletions

diff --git a/source/blender/makesrna/intern/rna_fluidsim.c b/source/blender/makesrna/intern/rna_fluidsim.c
index 210024f0859..4e047ff7772 100644
--- a/source/blender/makesrna/intern/rna_fluidsim.c
+++ b/source/blender/makesrna/intern/rna_fluidsim.c
@@ -64,10 +64,10 @@ static void rna_def_fluidsim_slip(StructRNA *srna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem slip_items[] = {
-		{OB_FSBND_NOSLIP, "NOSLIP", "No Slip", "Obstacle causes zero normal and tangential velocity (=sticky). Default for all. Only option for moving objects."},
-		{OB_FSBND_PARTSLIP, "PARTIALSLIP", "Partial Slip", "Mix between no-slip and free-slip. Non moving objects only!"},
-		{OB_FSBND_FREESLIP, "FREESLIP", "Free Slip", "Obstacle only causes zero normal velocity (=not sticky). Non moving objects only!"},
-		{0, NULL, NULL, NULL}};
+		{OB_FSBND_NOSLIP, "NOSLIP", 0, "No Slip", "Obstacle causes zero normal and tangential velocity (=sticky). Default for all. Only option for moving objects."},
+		{OB_FSBND_PARTSLIP, "PARTIALSLIP", 0, "Partial Slip", "Mix between no-slip and free-slip. Non moving objects only!"},
+		{OB_FSBND_FREESLIP, "FREESLIP", 0, "Free Slip", "Obstacle only causes zero normal velocity (=not sticky). Non moving objects only!"},
+		{0, NULL, 0, NULL, NULL}};
 
 	prop= RNA_def_property(srna, "slip_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "typeFlags");
@@ -86,17 +86,17 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem quality_items[] = {
-		{OB_FSDOM_GEOM, "GEOMETRY", "Geometry", "Display geometry."},
-		{OB_FSDOM_PREVIEW, "PREVIEW", "Preview", "Display preview quality results."},
-		{OB_FSDOM_FINAL, "FINAL", "Final", "Display final quality results."},
-		{0, NULL, NULL, NULL}};
+		{OB_FSDOM_GEOM, "GEOMETRY", 0, "Geometry", "Display geometry."},
+		{OB_FSDOM_PREVIEW, "PREVIEW", 0, "Preview", "Display preview quality results."},
+		{OB_FSDOM_FINAL, "FINAL", 0, "Final", "Display final quality results."},
+		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem viscosity_items[] = {
-		{1, "MANUAL", "Manual", "Manual viscosity settings."},
-		{2, "WATER", "Water", "Viscosity of 1.0 * 10^-6."},
-		{3, "OIL", "Oil", "Viscosity of 5.0 * 10^-5."},
-		{4, "HONEY", "Honey", "Viscosity of 2.0 * 10^-3."},
-		{0, NULL, NULL, NULL}};
+		{1, "MANUAL", 0, "Manual", "Manual viscosity settings."},
+		{2, "WATER", 0, "Water", "Viscosity of 1.0 * 10^-6."},
+		{3, "OIL", 0, "Oil", "Viscosity of 5.0 * 10^-5."},
+		{4, "HONEY", 0, "Honey", "Viscosity of 2.0 * 10^-3."},
+		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "DomainFluidSettings", "FluidSettings");
 	RNA_def_struct_sdna(srna, "FluidsimSettings");
@@ -217,10 +217,10 @@ static void rna_def_fluidsim_volume(StructRNA *srna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem volume_type_items[] = {
-		{1, "VOLUME", "Volume", "Use only the inner volume of the mesh."},
-		{2, "SHELL", "Shell", "Use only the outer shell of the mesh."},
-		{3, "BOTH", "Both", "Use both the inner volume and the outer shell of the mesh."},
-		{0, NULL, NULL, NULL}};
+		{1, "VOLUME", 0, "Volume", "Use only the inner volume of the mesh."},
+		{2, "SHELL", 0, "Shell", "Use only the outer shell of the mesh."},
+		{3, "BOTH", 0, "Both", "Use both the inner volume and the outer shell of the mesh."},
+		{0, NULL, 0, NULL, NULL}};
 
 	prop= RNA_def_property(srna, "volume_initialization", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "volumeInitType");
@@ -393,15 +393,15 @@ void RNA_def_fluidsim(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem prop_fluid_type_items[] = {
-		{0, "NONE", "None", ""},
-		{OB_FLUIDSIM_DOMAIN, "DOMAIN", "Domain", "Bounding box of this object represents the computational domain of the fluid simulation."},
-		{OB_FLUIDSIM_FLUID, "FLUID", "Fluid", "Object represents a volume of fluid in the simulation."},
-		{OB_FLUIDSIM_OBSTACLE, "OBSTACLE", "Obstacle", "Object is a fixed obstacle."},
-		{OB_FLUIDSIM_INFLOW, "INFLOW", "Inflow", "Object adds fluid to the simulation."},
-		{OB_FLUIDSIM_OUTFLOW, "OUTFLOW", "Outflow", "Object removes fluid from the simulation."},
-		{OB_FLUIDSIM_PARTICLE, "PARTICLE", "Particle", "Object is made a particle system to display particles generated by a fluidsim domain object."},
-		{OB_FLUIDSIM_CONTROL, "CONTROL", "Control", "Object is made a fluid control mesh, which influences the fluid."},
-		{0, NULL, NULL, NULL}};
+		{0, "NONE", 0, "None", ""},
+		{OB_FLUIDSIM_DOMAIN, "DOMAIN", 0, "Domain", "Bounding box of this object represents the computational domain of the fluid simulation."},
+		{OB_FLUIDSIM_FLUID, "FLUID", 0, "Fluid", "Object represents a volume of fluid in the simulation."},
+		{OB_FLUIDSIM_OBSTACLE, "OBSTACLE", 0, "Obstacle", "Object is a fixed obstacle."},
+		{OB_FLUIDSIM_INFLOW, "INFLOW", 0, "Inflow", "Object adds fluid to the simulation."},
+		{OB_FLUIDSIM_OUTFLOW, "OUTFLOW", 0, "Outflow", "Object removes fluid from the simulation."},
+		{OB_FLUIDSIM_PARTICLE, "PARTICLE", 0, "Particle", "Object is made a particle system to display particles generated by a fluidsim domain object."},
+		{OB_FLUIDSIM_CONTROL, "CONTROL", 0, "Control", "Object is made a fluid control mesh, which influences the fluid."},
+		{0, NULL, 0, NULL, NULL}};
 
 
 	srna= RNA_def_struct(brna, "FluidSettings", NULL);