[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33555] trunk/blender: pedantic word ordering change.
Campbell Barton
ideasman42 at gmail.com
Wed Dec 8 12:42:11 CET 2010
Revision: 33555
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33555
Author: campbellbarton
Date: 2010-12-08 12:42:11 +0100 (Wed, 08 Dec 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/release/scripts/modules/add_object_utils.py
trunk/blender/release/scripts/modules/io_utils.py
trunk/blender/release/scripts/op/add_mesh_torus.py
trunk/blender/release/scripts/op/io_shape_mdd/import_mdd.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/uv.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/templates/operator_modal.py
trunk/blender/release/scripts/templates/operator_modal_draw.py
trunk/blender/release/scripts/templates/operator_modal_view3d.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_userpref_keymap.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_ops.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/CMakeLists.txt 2010-12-08 11:42:11 UTC (rev 33555)
@@ -52,8 +52,8 @@
#-----------------------------------------------------------------------------
# Redirect output files
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
#-----------------------------------------------------------------------------
# Load some macros.
Modified: trunk/blender/release/scripts/modules/add_object_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/add_object_utils.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/modules/add_object_utils.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -44,7 +44,7 @@
return location * rotation
-def add_object_data(context, obdata, operator=None):
+def object_data_add(context, obdata, operator=None):
scene = context.scene
Modified: trunk/blender/release/scripts/modules/io_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/io_utils.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/modules/io_utils.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -37,7 +37,7 @@
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 @@
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'}
Modified: trunk/blender/release/scripts/op/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/op/add_mesh_torus.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/op/add_mesh_torus.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -128,7 +128,7 @@
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'}
Modified: trunk/blender/release/scripts/op/io_shape_mdd/import_mdd.py
===================================================================
--- trunk/blender/release/scripts/op/io_shape_mdd/import_mdd.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/op/io_shape_mdd/import_mdd.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -55,7 +55,7 @@
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 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
Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/op/object.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -246,10 +246,10 @@
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
Modified: trunk/blender/release/scripts/op/uv.py
===================================================================
--- trunk/blender/release/scripts/op/uv.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/op/uv.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -365,7 +365,7 @@
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'}
Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/op/wm.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -506,7 +506,7 @@
else:
self.initial_x = event.mouse_x
- context.window_manager.add_modal_handler(self)
+ context.window_manager.modal_handler_add(self)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/templates/operator_modal.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_modal.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/templates/operator_modal.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -25,7 +25,7 @@
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'}
Modified: trunk/blender/release/scripts/templates/operator_modal_draw.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_modal_draw.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/templates/operator_modal_draw.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -52,7 +52,7 @@
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'
Modified: trunk/blender/release/scripts/templates/operator_modal_view3d.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_modal_view3d.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/templates/operator_modal_view3d.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -42,7 +42,7 @@
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'
Modified: trunk/blender/release/scripts/ui/properties_scene.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_scene.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/ui/properties_scene.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -305,7 +305,7 @@
def invoke(self, context, event):
wm = context.window_manager
- wm.add_fileselect(self)
+ wm.fileselect_add(self)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -1203,7 +1203,7 @@
def invoke(self, context, event):
wm = context.window_manager
- wm.add_fileselect(self)
+ wm.fileselect_add(self)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref_keymap.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/ui/space_userpref_keymap.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -575,7 +575,7 @@
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 @@
def invoke(self, context, event):
wm = context.window_manager
- wm.add_fileselect(self)
+ wm.fileselect_add(self)
return {'RUNNING_MODAL'}
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2010-12-08 11:02:56 UTC (rev 33554)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2010-12-08 11:42:11 UTC (rev 33555)
@@ -2159,7 +2159,7 @@
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 @@
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")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list