rename ID.update() --> update_tag() since this function only tags for updating and scene.update() executes the update.

6 files changed, 7 insertions, 7 deletions

diff --git a/release/scripts/op/add_mesh_torus.py b/release/scripts/op/add_mesh_torus.py
index 53460ff264d..aac4c36da83 100644
--- a/release/scripts/op/add_mesh_torus.py
+++ b/release/scripts/op/add_mesh_torus.py
@@ -129,7 +129,7 @@ class AddTorus(bpy.types.Operator):
 
         mesh.vertices.foreach_set("co", verts_loc)
         mesh.faces.foreach_set("vertices_raw", faces)
-        mesh.update()
+        mesh.update_tag()
 
         import add_object_utils
         add_object_utils.object_data_add(context, mesh, operator=self)
diff --git a/release/scripts/op/object.py b/release/scripts/op/object.py
index 8fee6e2166d..688839e3d2c 100644
--- a/release/scripts/op/object.py
+++ b/release/scripts/op/object.py
@@ -506,7 +506,7 @@ class MakeDupliFace(bpy.types.Operator):
 
             mesh.vertices.foreach_set("co", face_verts)
             mesh.faces.foreach_set("vertices_raw", faces)
-            mesh.update()  # generates edge data
+            mesh.update_tag()  # generates edge data
 
             # pick an object to use
             obj = objects[0]
diff --git a/release/scripts/op/uvcalc_follow_active.py b/release/scripts/op/uvcalc_follow_active.py
index 10b40aa4538..a226e234f3a 100644
--- a/release/scripts/op/uvcalc_follow_active.py
+++ b/release/scripts/op/uvcalc_follow_active.py
@@ -216,7 +216,7 @@ def extend(obj, operator, EXTEND_MODE):
     if is_editmode:
         bpy.ops.object.mode_set(mode='EDIT')
     else:
-        me.update()
+        me.update_tag()
 
 
 def main(context, operator):
diff --git a/release/scripts/templates/operator_mesh_add.py b/release/scripts/templates/operator_mesh_add.py
index db614f3a74c..856a54f8f33 100644
--- a/release/scripts/templates/operator_mesh_add.py
+++ b/release/scripts/templates/operator_mesh_add.py
@@ -77,7 +77,7 @@ class AddBox(bpy.types.Operator):
 
         mesh.vertices.foreach_set("co", verts_loc)
         mesh.faces.foreach_set("vertices_raw", faces)
-        mesh.update()
+        mesh.update_tag()
 
         # add the mesh as an object into the scene with this utility module
         import add_object_utils
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index a428c811061..e1c0bc30102 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -250,7 +250,7 @@ ID *rna_ID_copy(ID *id)
 	return NULL;
 }
 
-static void rna_ID_update(ID *id, ReportList *reports, int flag)
+static void rna_ID_update_tag(ID *id, ReportList *reports, int flag)
 {
 	/* XXX, new function for this! */
 	/*if (ob->type == OB_FONT) {
@@ -478,7 +478,7 @@ static void rna_def_ID(BlenderRNA *brna)
 	func= RNA_def_function(srna, "animation_data_clear", "BKE_free_animdata");
 	RNA_def_function_ui_description(func, "Clear animation on this this ID.");
 
-	func= RNA_def_function(srna, "update", "rna_ID_update");
+	func= RNA_def_function(srna, "update_tag", "rna_ID_update_tag");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 	RNA_def_function_ui_description(func, "Tag the id to update its display data.");
 	RNA_def_enum_flag(func, "refresh", update_flag_items, 0, "", "Type of updates to perform.");
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c
index 80aeaedf940..ada8736158c 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -639,7 +639,7 @@ static char BPy_EnumProperty_doc[] =
 "   :type default: string or set\n"
 "   :arg options: Enumerator in ['HIDDEN', 'ANIMATABLE', 'ENUM_FLAG'].\n"
 "   :type options: set\n"
-"   :arg items: The items that make up this enumerator.\n"
+"   :arg items: sequence of enum items formatted: [(identifier, name, description), ...] where the identifier is used for python access and other values are used for the interface.\n"
 "   :type items: sequence of string triplets";
 static PyObject *BPy_EnumProperty(PyObject *self, PyObject *args, PyObject *kw)
 {