pedantic word ordering change.

- wm.add_modal_handler -> modal_handler_add
- wm.add_fileselect -> fileselect_add
- ob.add_shape_key -> shape_key_add
- VIEW3D_OT_add_background_image -> VIEW3D_OT_background_image_add (same for remove)

Also made 2 internal cmake vars hidden.

14 files changed, 19 insertions, 19 deletions

diff --git a/release/scripts/modules/add_object_utils.py b/release/scripts/modules/add_object_utils.py
index 44efc8f2ada..20f0ffdbe60 100644
--- a/release/scripts/modules/add_object_utils.py
+++ b/release/scripts/modules/add_object_utils.py
@@ -44,7 +44,7 @@ def add_object_align_init(context, operator):
     return location * rotation
 
 
-def add_object_data(context, obdata, operator=None):
+def object_data_add(context, obdata, operator=None):
 
     scene = context.scene
 
diff --git a/release/scripts/modules/io_utils.py b/release/scripts/modules/io_utils.py
index eb9b2eaa90b..39b38669188 100644
--- a/release/scripts/modules/io_utils.py
+++ b/release/scripts/modules/io_utils.py
@@ -37,7 +37,7 @@ class ExportHelper:
 
             self.filepath = blend_filepath + self.filename_ext
 
-        context.window_manager.add_fileselect(self)
+        context.window_manager.fileselect_add(self)
         return {'RUNNING_MODAL'}
 
     def check(self, context):
@@ -53,7 +53,7 @@ class ImportHelper:
     filepath = StringProperty(name="File Path", description="Filepath used for importing the file", maxlen=1024, default="", subtype='FILE_PATH')
 
     def invoke(self, context, event):
-        context.window_manager.add_fileselect(self)
+        context.window_manager.fileselect_add(self)
         return {'RUNNING_MODAL'}
 
 
diff --git a/release/scripts/op/add_mesh_torus.py b/release/scripts/op/add_mesh_torus.py
index 36baca45719..eee30dabb1d 100644
--- a/release/scripts/op/add_mesh_torus.py
+++ b/release/scripts/op/add_mesh_torus.py
@@ -128,7 +128,7 @@ class AddTorus(bpy.types.Operator):
         mesh.update()
 
         import add_object_utils
-        add_object_utils.add_object_data(context, mesh, operator=self)
+        add_object_utils.object_data_add(context, mesh, operator=self)
 
         return {'FINISHED'}
 
diff --git a/release/scripts/op/io_shape_mdd/import_mdd.py b/release/scripts/op/io_shape_mdd/import_mdd.py
index 2aa132384a7..990c1a56619 100644
--- a/release/scripts/op/io_shape_mdd/import_mdd.py
+++ b/release/scripts/op/io_shape_mdd/import_mdd.py
@@ -55,7 +55,7 @@ def load(operator, context, filepath, frame_start=0, frame_step=1):
     try:
         num_keys = len(obj.data.shape_keys.keys)
     except:
-        basis = obj.add_shape_key()
+        basis = obj.shape_key_add()
         basis.name = "Basis"
         obj.data.update()
 
@@ -64,7 +64,7 @@ def load(operator, context, filepath, frame_start=0, frame_step=1):
     def UpdateMesh(ob, fr):
 
         # Insert new shape key
-        new_shapekey = obj.add_shape_key()
+        new_shapekey = obj.shape_key_add()
         new_shapekey.name = ("frame_%.4d" % fr)
         new_shapekey_name = new_shapekey.name
 
diff --git a/release/scripts/op/object.py b/release/scripts/op/object.py
index b5c46c757b3..cb6db059e9f 100644
--- a/release/scripts/op/object.py
+++ b/release/scripts/op/object.py
@@ -246,10 +246,10 @@ class ShapeTransfer(bpy.types.Operator):
 
         def ob_add_shape(ob, name):
             me = ob.data
-            key = ob.add_shape_key(from_mix=False)
+            key = ob.shape_key_add(from_mix=False)
             if len(me.shape_keys.keys) == 1:
                 key.name = "Basis"
-                key = ob.add_shape_key(from_mix=False)  # we need a rest
+                key = ob.shape_key_add(from_mix=False)  # we need a rest
             key.name = name
             ob.active_shape_key_index = len(me.shape_keys.keys) - 1
             ob.show_only_shape_key = True
diff --git a/release/scripts/op/uv.py b/release/scripts/op/uv.py
index f1155513ac3..e362d0932c3 100644
--- a/release/scripts/op/uv.py
+++ b/release/scripts/op/uv.py
@@ -365,7 +365,7 @@ class ExportUVLayout(bpy.types.Operator):
         self.size = self._image_size(context)
         self.filepath = os.path.splitext(bpy.data.filepath)[0]
         wm = context.window_manager
-        wm.add_fileselect(self)
+        wm.fileselect_add(self)
         return {'RUNNING_MODAL'}
 
 
diff --git a/release/scripts/op/wm.py b/release/scripts/op/wm.py
index 43181ab0dce..8879b2bbaf2 100644
--- a/release/scripts/op/wm.py
+++ b/release/scripts/op/wm.py
@@ -506,7 +506,7 @@ class WM_OT_context_modal_mouse(bpy.types.Operator):
         else:
             self.initial_x = event.mouse_x
 
-            context.window_manager.add_modal_handler(self)
+            context.window_manager.modal_handler_add(self)
             return {'RUNNING_MODAL'}
 
 
diff --git a/release/scripts/templates/operator_modal.py b/release/scripts/templates/operator_modal.py
index 522f9fea050..6283626e7b1 100644
--- a/release/scripts/templates/operator_modal.py
+++ b/release/scripts/templates/operator_modal.py
@@ -25,7 +25,7 @@ class ModalOperator(bpy.types.Operator):
 
     def invoke(self, context, event):
         if context.object:
-            context.window_manager.add_modal_handler(self)
+            context.window_manager.modal_handler_add(self)
             self.first_mouse_x = event.mouse_x
             self.first_value = context.object.location.x
             return {'RUNNING_MODAL'}
diff --git a/release/scripts/templates/operator_modal_draw.py b/release/scripts/templates/operator_modal_draw.py
index 2a3db3e3018..e159bc0f9c5 100644
--- a/release/scripts/templates/operator_modal_draw.py
+++ b/release/scripts/templates/operator_modal_draw.py
@@ -52,7 +52,7 @@ class ModalDrawOperator(bpy.types.Operator):
 
     def invoke(self, context, event):
         if context.area.type == 'VIEW_3D':
-            context.window_manager.add_modal_handler(self)
+            context.window_manager.modal_handler_add(self)
 
             # Add the region OpenGL drawing callback
             # draw in view space with 'POST_VIEW' and 'PRE_VIEW'
diff --git a/release/scripts/templates/operator_modal_view3d.py b/release/scripts/templates/operator_modal_view3d.py
index 5a7f5513992..55b58596f17 100644
--- a/release/scripts/templates/operator_modal_view3d.py
+++ b/release/scripts/templates/operator_modal_view3d.py
@@ -42,7 +42,7 @@ class ViewOperator(bpy.types.Operator):
             v3d = context.space_data
             rv3d = v3d.region_3d
 
-            context.window_manager.add_modal_handler(self)
+            context.window_manager.modal_handler_add(self)
 
             if rv3d.view_perspective == 'CAMERA':
                 rv3d.view_perspective = 'PERSP'
diff --git a/release/scripts/ui/properties_scene.py b/release/scripts/ui/properties_scene.py
index b6668e19993..4855b309bf4 100644
--- a/release/scripts/ui/properties_scene.py
+++ b/release/scripts/ui/properties_scene.py
@@ -305,7 +305,7 @@ class ANIM_OT_keying_set_export(bpy.types.Operator):
 
     def invoke(self, context, event):
         wm = context.window_manager
-        wm.add_fileselect(self)
+        wm.fileselect_add(self)
         return {'RUNNING_MODAL'}
 
 
diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py
index 6ce58344b37..53c5051e25c 100644
--- a/release/scripts/ui/space_userpref.py
+++ b/release/scripts/ui/space_userpref.py
@@ -1203,7 +1203,7 @@ class WM_OT_addon_install(bpy.types.Operator):
 
     def invoke(self, context, event):
         wm = context.window_manager
-        wm.add_fileselect(self)
+        wm.fileselect_add(self)
         return {'RUNNING_MODAL'}
 
 
diff --git a/release/scripts/ui/space_userpref_keymap.py b/release/scripts/ui/space_userpref_keymap.py
index 4569020efd9..8e34eb89af3 100644
--- a/release/scripts/ui/space_userpref_keymap.py
+++ b/release/scripts/ui/space_userpref_keymap.py
@@ -575,7 +575,7 @@ class WM_OT_keyconfig_import(bpy.types.Operator):
 
     def invoke(self, context, event):
         wm = context.window_manager
-        wm.add_fileselect(self)
+        wm.fileselect_add(self)
         return {'RUNNING_MODAL'}
 
 # This operator is also used by interaction presets saving - AddPresetBase
@@ -665,7 +665,7 @@ class WM_OT_keyconfig_export(bpy.types.Operator):
 
     def invoke(self, context, event):
         wm = context.window_manager
-        wm.add_fileselect(self)
+        wm.fileselect_add(self)
         return {'RUNNING_MODAL'}
 
 
diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py
index 1bbff0b5820..22ae16bf041 100644
--- a/release/scripts/ui/space_view3d.py
+++ b/release/scripts/ui/space_view3d.py
@@ -2159,7 +2159,7 @@ class VIEW3D_PT_background_image(bpy.types.Panel):
         view = context.space_data
 
         col = layout.column()
-        col.operator("view3d.add_background_image", text="Add Image")
+        col.operator("view3d.background_image_add", text="Add Image")
 
         for i, bg in enumerate(view.background_images):
             layout.active = view.show_background_images
@@ -2170,7 +2170,7 @@ class VIEW3D_PT_background_image(bpy.types.Panel):
                 row.prop(bg.image, "name", text="", emboss=False)
             else:
                 row.label(text="Not Set")
-            row.operator("view3d.remove_background_image", text="", emboss=False, icon='X').index = i
+            row.operator("view3d.background_image_remove", text="", emboss=False, icon='X').index = i
 
             box.prop(bg, "view_axis", text="Axis")