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.

4 files changed, 44 insertions, 44 deletions

diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c
index 40373c9f327..dd003d103d5 100644
--- a/source/blender/editors/mesh/editmesh.c
+++ b/source/blender/editors/mesh/editmesh.c
@@ -1434,10 +1434,10 @@ void remake_editMesh(Scene *scene, Object *ob)
 /* *************** Operator: separate parts *************/
 
 static EnumPropertyItem prop_separate_types[] = {
-	{0, "SELECTED", "Selection", ""},
-	{1, "MATERIAL", "By Material", ""},
-	{2, "LOOSE", "By loose parts", ""},
-	{0, NULL, NULL, NULL}
+	{0, "SELECTED", 0, "Selection", ""},
+	{1, "MATERIAL", 0, "By Material", ""},
+	{2, "LOOSE", 0, "By loose parts", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 /* return 1: success */
diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c
index d0f7517df78..afbf43c4d85 100644
--- a/source/blender/editors/mesh/editmesh_loop.c
+++ b/source/blender/editors/mesh/editmesh_loop.c
@@ -458,10 +458,10 @@ typedef struct CutCurve {
 #define KNIFE_MULTICUT	3
 
 static EnumPropertyItem knife_items[]= {
-	{KNIFE_EXACT, "EXACT", "Exact", ""},
-	{KNIFE_MIDPOINT, "MIDPOINTS", "Midpoints", ""},
-	{KNIFE_MULTICUT, "MULTICUT", "Multicut", ""},
-	{0, NULL, NULL}
+	{KNIFE_EXACT, "EXACT", 0, "Exact", ""},
+	{KNIFE_MIDPOINT, "MIDPOINTS", 0, "Midpoints", ""},
+	{KNIFE_MULTICUT, "MULTICUT", 0, "Multicut", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 /* seg_intersect() Determines if and where a mouse trail intersects an EditEdge */
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index faa3176c958..a1f8b3251c8 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -655,13 +655,13 @@ FACES GROUP
 */
 
 static EnumPropertyItem prop_simface_types[] = {
-	{1, "MATERIAL", "Material", ""},
-	{2, "IMAGE", "Image", ""},
-	{3, "AREA", "Area", ""},
-	{4, "PERIMETER", "Perimeter", ""},
-	{5, "NORMAL", "Normal", ""},
-	{6, "COPLANAR", "Co-planar", ""},
-	{0, NULL, NULL, NULL}
+	{1, "MATERIAL", 0, "Material", ""},
+	{2, "IMAGE", 0, "Image", ""},
+	{3, "AREA", 0, "Area", ""},
+	{4, "PERIMETER", 0, "Perimeter", ""},
+	{5, "NORMAL", 0, "Normal", ""},
+	{6, "COPLANAR", 0, "Co-planar", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 
@@ -849,14 +849,14 @@ EDGE GROUP
 */
 
 static EnumPropertyItem prop_simedge_types[] = {
-	{1, "LENGTH", "Length", ""},
-	{2, "DIR", "Direction", ""},
-	{3, "FACE", "Amount of Vertices in Face", ""},
-	{4, "FACE_ANGLE", "Face Angles", ""},
-	{5, "CREASE", "Crease", ""},
-	{6, "SEAM", "Seam", ""},
-	{7, "SHARP", "Sharpness", ""},
-	{0, NULL, NULL, NULL}
+	{1, "LENGTH", 0, "Length", ""},
+	{2, "DIR", 0, "Direction", ""},
+	{3, "FACE", 0, "Amount of Vertices in Face", ""},
+	{4, "FACE_ANGLE", 0, "Face Angles", ""},
+	{5, "CREASE", 0, "Crease", ""},
+	{6, "SEAM", 0, "Seam", ""},
+	{7, "SHARP", 0, "Sharpness", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 static int similar_edge_select__internal(Scene *scene, EditMesh *em, int mode)
@@ -1105,10 +1105,10 @@ VERT GROUP
  mode 3: same vertex groups
 */
 static EnumPropertyItem prop_simvertex_types[] = {
-	{0, "NORMAL", "Normal", ""},
-	{1, "FACE", "Amount of Vertices in Face", ""},
-	{2, "VGROUP", "Vertex Groups", ""},
-	{0, NULL, NULL, NULL}
+	{0, "NORMAL", 0, "Normal", ""},
+	{1, "FACE", 0, "Amount of Vertices in Face", ""},
+	{2, "VGROUP", 0, "Vertex Groups", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 
@@ -3537,10 +3537,10 @@ static void mesh_selection_type(Scene *scene, EditMesh *em, int val)
 }
 
 static EnumPropertyItem prop_mesh_edit_types[] = {
-	{1, "VERT", "Vertices", ""},
-	{2, "EDGE", "Edges", ""},
-	{3, "FACE", "Faces", ""},
-	{0, NULL, NULL, NULL}
+	{1, "VERT", 0, "Vertices", ""},
+	{2, "EDGE", 0, "Edges", ""},
+	{3, "FACE", 0, "Faces", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 static int mesh_selection_type_exec(bContext *C, wmOperator *op)
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 4fc16297db8..45cf67de17e 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -1273,14 +1273,14 @@ void delete_mesh(Object *obedit, EditMesh *em, wmOperator *op, int event)
 
 /* Note, these values must match delete_mesh() event values */
 static EnumPropertyItem prop_mesh_delete_types[] = {
-	{10,"VERT",		"Vertices", ""},
-	{1, "EDGE",		"Edges", ""},
-	{2, "FACE",		"Faces", ""},
-	{3, "ALL",		"All", ""},
-	{4, "EDGE_FACE","Edges & Faces", ""},
-	{5, "ONLY_FACE","Only Faces", ""},
-	{6, "EDGE_LOOP","Edge Loop", ""},
-	{0, NULL, NULL, NULL}
+	{10,"VERT",		0, "Vertices", ""},
+	{1, "EDGE",		0, "Edges", ""},
+	{2, "FACE",		0, "Faces", ""},
+	{3, "ALL",		0, "All", ""},
+	{4, "EDGE_FACE",0, "Edges & Faces", ""},
+	{5, "ONLY_FACE",0, "Only Faces", ""},
+	{6, "EDGE_LOOP",0, "Edge Loop", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 static int delete_mesh_exec(bContext *C, wmOperator *op)
@@ -6646,11 +6646,11 @@ static int subdivs_exec(bContext *C, wmOperator *op)
 void MESH_OT_subdivs(wmOperatorType *ot)
 {
 	static EnumPropertyItem type_items[]= {
-		{0, "SIMPLE", "Simple", ""},
-		{1, "MULTI", "Multi", ""},
-		{2, "FRACTAL", "Fractal", ""},
-		{3, "SMOOTH", "Smooth", ""},
-		{0, NULL, NULL}};
+		{0, "SIMPLE", 0, "Simple", ""},
+		{1, "MULTI", 0, "Multi", ""},
+		{2, "FRACTAL", 0, "Fractal", ""},
+		{3, "SMOOTH", 0, "Smooth", ""},
+		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */
 	ot->name= "subdivs";