[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39394] branches/soc-2011-salad: Merging r39252 through r39391 from trunk into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Sun Aug 14 14:11:47 CEST 2011
Revision: 39394
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39394
Author: nazgul
Date: 2011-08-14 12:11:46 +0000 (Sun, 14 Aug 2011)
Log Message:
-----------
Merging r39252 through r39391 from trunk into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39252
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39391
Modified Paths:
--------------
branches/soc-2011-salad/SConstruct
branches/soc-2011-salad/build_files/buildbot/master.cfg
branches/soc-2011-salad/build_files/scons/config/darwin-config.py
branches/soc-2011-salad/build_files/scons/tools/btools.py
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-salad/release/datafiles/splash.png
branches/soc-2011-salad/release/scripts/modules/bpy/__init__.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/animsys_update.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/image.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/object.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_console.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_filebrowser.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_outliner.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-salad/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-salad/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-salad/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-salad/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-salad/source/blender/blenkernel/intern/node.c
branches/soc-2011-salad/source/blender/blenkernel/intern/unit.c
branches/soc-2011-salad/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-salad/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-salad/source/blender/editors/armature/poseSlide.c
branches/soc-2011-salad/source/blender/editors/datafiles/splash.png.c
branches/soc-2011-salad/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-salad/source/blender/editors/include/ED_node.h
branches/soc-2011-salad/source/blender/editors/interface/interface_layout.c
branches/soc-2011-salad/source/blender/editors/interface/interface_templates.c
branches/soc-2011-salad/source/blender/editors/interface/interface_utils.c
branches/soc-2011-salad/source/blender/editors/object/object_add.c
branches/soc-2011-salad/source/blender/editors/object/object_transform.c
branches/soc-2011-salad/source/blender/editors/render/render_update.c
branches/soc-2011-salad/source/blender/editors/space_console/console_ops.c
branches/soc-2011-salad/source/blender/editors/space_node/node_edit.c
branches/soc-2011-salad/source/blender/editors/space_node/node_header.c
branches/soc-2011-salad/source/blender/editors/space_node/node_intern.h
branches/soc-2011-salad/source/blender/editors/space_node/node_select.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-salad/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-salad/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2011-salad/source/blender/gpu/GPU_extensions.h
branches/soc-2011-salad/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-salad/source/blender/makesrna/RNA_access.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-salad/source/blender/python/intern/bpy_operator.c
branches/soc-2011-salad/source/blender/python/intern/bpy_rna.c
branches/soc-2011-salad/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-salad/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-salad/source/blender/windowmanager/WM_api.h
branches/soc-2011-salad/source/blender/windowmanager/WM_types.h
branches/soc-2011-salad/source/blender/windowmanager/intern/wm.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-salad/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-salad/source/gameengine/Ketsji/KX_Light.cpp
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39215
/branches/soc-2011-tomato:36831-39252
/trunk/blender:36834-39251
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39215
/branches/soc-2011-tomato:36831-39252
/trunk/blender:36834-39391
Modified: branches/soc-2011-salad/SConstruct
===================================================================
--- branches/soc-2011-salad/SConstruct 2011-08-14 12:02:01 UTC (rev 39393)
+++ branches/soc-2011-salad/SConstruct 2011-08-14 12:11:46 UTC (rev 39394)
@@ -268,7 +268,8 @@
if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
env['WITH_BF_3DMOUSE'] = 0
- env['FOUND_NDOF_DRIVERS'] = 0
+ else:
+ env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
if env['WITH_BF_OPENMP'] == 1:
Modified: branches/soc-2011-salad/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/master.cfg 2011-08-14 12:02:01 UTC (rev 39393)
+++ branches/soc-2011-salad/build_files/buildbot/master.cfg 2011-08-14 12:11:46 UTC (rev 39394)
@@ -116,7 +116,7 @@
add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
add_builder(c, 'win32_scons', 'windows', generic_builder)
add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
-add_builder(c, 'win64_scons', 'windows', generic_builder)
+add_builder(c, 'win64_scons', 'win64', generic_builder)
#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
Modified: branches/soc-2011-salad/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/darwin-config.py 2011-08-14 12:02:01 UTC (rev 39393)
+++ branches/soc-2011-salad/build_files/scons/config/darwin-config.py 2011-08-14 12:11:46 UTC (rev 39394)
@@ -285,9 +285,7 @@
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
#On-Surface Brush
-WITH_BF_ONSURFACEBRUSH = True
-
-# SpaceNavigator and related 3D mice
+# SpaceNavigator and related 3D mice, driver must be 3DxWare 10 Beta 4 (Mac OS X) or later !
WITH_BF_3DMOUSE = True
#############################################################################
@@ -318,9 +316,6 @@
else:
PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
-if FOUND_NDOF_DRIVERS:
- PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS + ['-weak_framework','3DconnexionClient']
-
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/soc-2011-salad/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/tools/btools.py 2011-08-14 12:02:01 UTC (rev 39393)
+++ branches/soc-2011-salad/build_files/scons/tools/btools.py 2011-08-14 12:11:46 UTC (rev 39394)
@@ -137,7 +137,7 @@
'BF_NO_ELBEEM',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
- 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'FOUND_NDOF_DRIVERS', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
+ 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC'
]
# Have options here that scons expects to be lists
@@ -440,7 +440,6 @@
(BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),
(BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D mouses', False)),
- (BoolVariable('FOUND_NDOF_DRIVERS', 'We detected NDOF libs or framework', False)),
(BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse library', False)),
('BF_3DMOUSE', '3d mouse library base path', ''),
('BF_3DMOUSE_INC', '3d mouse library include path', ''),
Modified: branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
===================================================================
--- branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm 2011-08-14 12:02:01 UTC (rev 39393)
+++ branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm 2011-08-14 12:11:46 UTC (rev 39394)
@@ -159,18 +159,22 @@
GHOST_NDOFManagerCocoa::~GHOST_NDOFManagerCocoa()
{
- UnregisterConnexionClient(m_clientID);
- CleanupConnexionHandlers();
- ghost_system = NULL;
- ndof_manager = NULL;
+ if (available())
+ {
+ UnregisterConnexionClient(m_clientID);
+ CleanupConnexionHandlers();
+ ghost_system = NULL;
+ ndof_manager = NULL;
+ }
}
-
-bool GHOST_NDOFManagerCocoa::available()
-{
- // extern OSErr InstallConnexionHandlers() __attribute__((weak_import));
- // ^^ not needed since the entire framework is weak-linked
- return InstallConnexionHandlers != NULL;
- // this means that the driver is installed and dynamically linked to blender
+extern "C" {
+ bool GHOST_NDOFManagerCocoa::available()
+ {
+ extern OSErr InstallConnexionHandlers() __attribute__((weak_import));
+ // Make the linker happy for the framework check (see link below for more info)
+ // http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/WeakLinking.html
+ return InstallConnexionHandlers != NULL;
+ // this means that the driver is installed and dynamically linked to blender
+ }
}
-
#endif // WITH_INPUT_NDOF
Modified: branches/soc-2011-salad/release/datafiles/splash.png
===================================================================
(Binary files differ)
Modified: branches/soc-2011-salad/release/scripts/modules/bpy/__init__.py
===================================================================
--- branches/soc-2011-salad/release/scripts/modules/bpy/__init__.py 2011-08-14 12:02:01 UTC (rev 39393)
+++ branches/soc-2011-salad/release/scripts/modules/bpy/__init__.py 2011-08-14 12:11:46 UTC (rev 39394)
@@ -44,14 +44,18 @@
ops = ops.ops_fake_module
-def _main():
- import sys as _sys
+def main():
+ import sys
# Possibly temp. addons path
from os.path import join, dirname, normpath
- _sys.path.append(normpath(join(dirname(__file__),
+ sys.path.append(normpath(join(dirname(__file__),
"..", "..", "addons", "modules")))
+ # fake module to allow:
+ # from bpy.types import Panel
+ sys.modules["bpy.types"] = types
+
# if "-d" in sys.argv: # Enable this to measure startup speed
if 0:
import cProfile
@@ -65,6 +69,6 @@
utils.load_scripts()
-_main()
+main()
-del _main
+del main
Modified: branches/soc-2011-salad/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_operators/add_mesh_torus.py 2011-08-14 12:02:01 UTC (rev 39393)
+++ branches/soc-2011-salad/release/scripts/startup/bl_operators/add_mesh_torus.py 2011-08-14 12:11:46 UTC (rev 39394)
@@ -18,6 +18,7 @@
# <pep8-80 compliant>
import bpy
+from bpy.types import Operator
import mathutils
@@ -81,7 +82,7 @@
)
-class AddTorus(bpy.types.Operator):
+class AddTorus(Operator):
'''Add a torus mesh'''
bl_idname = "mesh.primitive_torus_add"
bl_label = "Add Torus"
Modified: branches/soc-2011-salad/release/scripts/startup/bl_operators/animsys_update.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_operators/animsys_update.py 2011-08-14 12:02:01 UTC (rev 39393)
+++ branches/soc-2011-salad/release/scripts/startup/bl_operators/animsys_update.py 2011-08-14 12:11:46 UTC (rev 39394)
@@ -686,9 +686,10 @@
import bpy
+from bpy.types import Operator
-class UpdateAnimData(bpy.types.Operator):
+class UpdateAnimData(Operator):
"""Update data paths from 2.56 and previous versions, modifying data paths of drivers and fcurves"""
bl_idname = "anim.update_data_paths"
bl_label = "Update Animation Data"
Modified: branches/soc-2011-salad/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_operators/image.py 2011-08-14 12:02:01 UTC (rev 39393)
+++ branches/soc-2011-salad/release/scripts/startup/bl_operators/image.py 2011-08-14 12:11:46 UTC (rev 39394)
@@ -19,10 +19,11 @@
# <pep8-80 compliant>
import bpy
+from bpy.types import Operator
from bpy.props import StringProperty
-class EditExternally(bpy.types.Operator):
+class EditExternally(Operator):
'''Edit image in an external application'''
bl_idname = "image.external_edit"
bl_label = "Image Edit Externally"
@@ -106,7 +107,7 @@
return {'FINISHED'}
-class SaveDirty(bpy.types.Operator):
+class SaveDirty(Operator):
"""Save all modified textures"""
bl_idname = "image.save_dirty"
bl_label = "Save Dirty"
@@ -129,7 +130,7 @@
return {'FINISHED'}
-class ProjectEdit(bpy.types.Operator):
+class ProjectEdit(Operator):
"""Edit a snapshot of the viewport in an external image editor"""
bl_idname = "image.project_edit"
bl_label = "Project Edit"
@@ -196,7 +197,7 @@
return {'FINISHED'}
-class ProjectApply(bpy.types.Operator):
+class ProjectApply(Operator):
"""Project edited image back onto the object"""
bl_idname = "image.project_apply"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list