diff options
-rw-r--r-- | release/scripts/op/wm.py | 4 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d.py | 6 | ||||
-rw-r--r-- | source/blender/python/CMakeLists.txt | 43 | ||||
-rw-r--r-- | source/blender/python/generic/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 59 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna_array.c (renamed from source/blender/python/intern/bpy_array.c) | 0 |
6 files changed, 65 insertions, 48 deletions
diff --git a/release/scripts/op/wm.py b/release/scripts/op/wm.py index a382cab40a3..c6fe66d8909 100644 --- a/release/scripts/op/wm.py +++ b/release/scripts/op/wm.py @@ -268,8 +268,8 @@ class WM_OT_context_toggle_enum(bpy.types.Operator): class WM_OT_context_cycle_int(bpy.types.Operator): - '''Set a context value. Useful for cycling active material, - vertex keys, groups' etc.''' + '''Set a context value. Useful for cycling active material, ''' + '''vertex keys, groups' etc.''' bl_idname = "wm.context_cycle_int" bl_label = "Context Int Cycle" bl_options = {'UNDO'} diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index f825a1e174e..e44b4220829 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -1439,7 +1439,7 @@ class VIEW3D_OT_edit_mesh_extrude_individual_move(bpy.types.Operator): totvert = mesh.total_vert_sel if select_mode[2] and totface == 1: - return bpy.ops.mesh.extrude_region_move('INVOKE_REGION_WIN', TRANSFORM_OT_translate={"constraint_orientation": "NORMAL", "constraint_axis": [False, False, True]}) + return bpy.ops.mesh.extrude_region_move('INVOKE_REGION_WIN', TRANSFORM_OT_translate={"constraint_orientation": 'NORMAL', "constraint_axis": (False, False, True)}) elif select_mode[2] and totface > 1: return bpy.ops.mesh.extrude_faces_move('INVOKE_REGION_WIN') elif select_mode[1] and totedge >= 1: @@ -1464,9 +1464,9 @@ class VIEW3D_OT_edit_mesh_extrude_move(bpy.types.Operator): totvert = mesh.total_vert_sel if totface >= 1: - return bpy.ops.mesh.extrude_region_move('INVOKE_REGION_WIN', TRANSFORM_OT_translate={"constraint_orientation": "NORMAL", "constraint_axis": [False, False, True]}) + return bpy.ops.mesh.extrude_region_move('INVOKE_REGION_WIN', TRANSFORM_OT_translate={"constraint_orientation": 'NORMAL', "constraint_axis": (False, False, True)}) elif totedge == 1: - return bpy.ops.mesh.extrude_region_move('INVOKE_REGION_WIN', TRANSFORM_OT_translate={"constraint_orientation": "NORMAL", "constraint_axis": [True, True, False]}) + return bpy.ops.mesh.extrude_region_move('INVOKE_REGION_WIN', TRANSFORM_OT_translate={"constraint_orientation": 'NORMAL', "constraint_axis": (True, True, False)}) else: return bpy.ops.mesh.extrude_region_move('INVOKE_REGION_WIN') diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt index 3ffdb46e72e..b006e7b0be6 100644 --- a/source/blender/python/CMakeLists.txt +++ b/source/blender/python/CMakeLists.txt @@ -14,48 +14,7 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# The Original Code is Copyright (C) 2006, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurainm, Campbell Barton -# # ***** END GPL LICENSE BLOCK ***** +ADD_SUBDIRECTORY(intern) ADD_SUBDIRECTORY(generic) - -SET(INC - . - ../blenlib - ../makesdna - ../makesrna - ../blenkernel - ../windowmanager - ../editors/include - ../../../intern/guardedalloc - ../../../intern/audaspace/intern - ${PYTHON_INC} -) - -SET(SRC - intern/bpy.c - intern/bpy_app.c - intern/bpy_array.c - intern/bpy_driver.c - intern/bpy_interface.c - intern/bpy_operator.c - intern/bpy_operator_wrap.c - intern/bpy_props.c - intern/bpy_rna.c - intern/bpy_rna_callback.c - intern/bpy_util.c - intern/stubs.c -) - -# only to check if buildinfo is available -IF(WITH_BUILDINFO) - ADD_DEFINITIONS(-DBUILD_DATE) -ENDIF(WITH_BUILDINFO) - -BLENDERLIB(bf_python "${SRC}" "${INC}") diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 2f5551d4c96..6513cf66c47 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -23,7 +23,6 @@ SET(INC ../../blenlib ../../makesdna ../../blenkernel - ../../editors/include ../../../../intern/guardedalloc ../../../../extern/glew/include ${PYTHON_INC} diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt new file mode 100644 index 00000000000..e849623ad65 --- /dev/null +++ b/source/blender/python/intern/CMakeLists.txt @@ -0,0 +1,59 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# The Original Code is Copyright (C) 2006, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Jacques Beaurainm, Campbell Barton +# +# ***** END GPL LICENSE BLOCK ***** + +SET(INC + ../ + ../../blenlib + ../../makesdna + ../../makesrna + ../../blenkernel + ../../windowmanager + ../../editors/include + ../../../../intern/guardedalloc + ../../../../intern/audaspace/intern + ${PYTHON_INC} +) + +SET(SRC + bpy.c + bpy_app.c + bpy_driver.c + bpy_interface.c + bpy_operator.c + bpy_operator_wrap.c + bpy_props.c + bpy_rna.c + bpy_rna_array.c + bpy_rna_callback.c + bpy_util.c + stubs.c +) + +# only to check if buildinfo is available +IF(WITH_BUILDINFO) + ADD_DEFINITIONS(-DBUILD_DATE) +ENDIF(WITH_BUILDINFO) + +BLENDERLIB(bf_python "${SRC}" "${INC}") diff --git a/source/blender/python/intern/bpy_array.c b/source/blender/python/intern/bpy_rna_array.c index d219757b777..d219757b777 100644 --- a/source/blender/python/intern/bpy_array.c +++ b/source/blender/python/intern/bpy_rna_array.c |