[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32549] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32200 :32300

Nicholas Bishop nicholasbishop at gmail.com
Mon Oct 18 04:43:54 CEST 2010


Revision: 32549
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32549
Author:   nicholasbishop
Date:     2010-10-18 04:43:53 +0200 (Mon, 18 Oct 2010)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32200:32300

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/CMakeLists.txt
    branches/soc-2010-nicolasbishop/build_files/scons/tools/Blender.py
    branches/soc-2010-nicolasbishop/extern/bullet2/src/LinearMath/btQuickprof.cpp
    branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2010-nicolasbishop/release/datafiles/blenderbuttons
    branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/path.py
    branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py
    branches/soc-2010-nicolasbishop/release/scripts/op/animsys_update.py
    branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py
    branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/export_obj.py
    branches/soc-2010-nicolasbishop/release/scripts/op/wm.py
    branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal_view3d.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_dopesheet.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_image.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_info.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
    branches/soc-2010-nicolasbishop/source/Makefile
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_curve.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/SConscript
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/curve.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/node.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/report.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/smoke.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sound.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_path_util.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/string.c
    branches/soc-2010-nicolasbishop/source/blender/collada/DocumentExporter.cpp
    branches/soc-2010-nicolasbishop/source/blender/collada/DocumentImporter.cpp
    branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyingsets.c
    branches/soc-2010-nicolasbishop/source/blender/editors/armature/armature_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature.c
    branches/soc-2010-nicolasbishop/source/blender/editors/armature/poselib.c
    branches/soc-2010-nicolasbishop/source/blender/editors/armature/poseobject.c
    branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
    branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_keyframing.h
    branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_screen.h
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_icons.c
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_widgets.c
    branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_add.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_relations.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_transform.c
    branches/soc-2010-nicolasbishop/source/blender/editors/render/render_opengl.c
    branches/soc-2010-nicolasbishop/source/blender/editors/screen/area.c
    branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_console/console_draw.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_console/console_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_draw.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_image/space_image.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/readimage.c
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_vec_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/makesrna.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_material.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_armature.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_cloth.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_curve.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_decimate.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_lattice.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_mirror.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_none.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_shapekey.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_smoke.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_softbody.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_surface.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2010-nicolasbishop/source/blender/python/doc/sphinx_doc_gen.sh
    branches/soc-2010-nicolasbishop/source/blender/python/generic/IDProp.c
    branches/soc-2010-nicolasbishop/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-nicolasbishop/source/blender/python/generic/bpy_internal_import.h
    branches/soc-2010-nicolasbishop/source/blender/python/generic/py_capi_utils.c
    branches/soc-2010-nicolasbishop/source/blender/python/generic/py_capi_utils.h
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy.c
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_interface.c
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_props.c
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-nicolasbishop/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/WM_types.h
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-nicolasbishop/source/creator/CMakeLists.txt
    branches/soc-2010-nicolasbishop/source/creator/buildinfo.c
    branches/soc-2010-nicolasbishop/source/creator/creator.c
    branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2010-nicolasbishop/source/gameengine/PyDoc/bge.types.rst

Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt	2010-10-18 02:43:53 UTC (rev 32549)
@@ -297,7 +297,7 @@
 
 	FIND_PACKAGE(X11 REQUIRED)
 
-	SET(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
+	SET(LLIBS "-lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
 
 	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		# BSD's dont use libdl.so
@@ -547,7 +547,21 @@
 		SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
 		ADD_DEFINITIONS(-DFREE_WINDOWS)
-		
+
+		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+		SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+
+
+		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
+		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
+
+		SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DNDEBUG")
+		SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG")
+
+		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")
+		SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG")
+
+
 		IF(WITH_OPENMP)
 			SET(LLIBS "${LLIBS} -lgomp")
 			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")

Modified: branches/soc-2010-nicolasbishop/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/scons/tools/Blender.py	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/build_files/scons/tools/Blender.py	2010-10-18 02:43:53 UTC (rev 32549)
@@ -282,7 +282,7 @@
     build_time = time.strftime ("%H:%M:%S")
     build_rev = os.popen('svnversion').read()[:-1] # remove \n
     if build_rev == '': 
-        build_rev = '<UNKNOWN>'
+        build_rev = '-UNKNOWN-'
     if lenv['BF_DEBUG']:
         build_type = "Debug"
     else:
@@ -295,9 +295,12 @@
                                     'BUILD_TYPE="%s"'%(build_type),
                                     'BUILD_REV="%s"'%(build_rev),
                                     'NAN_BUILDINFO',
-				    'BUILD_PLATFORM="%s:%s"'%(platform.system(), platform.architecture()[0])])
-        obj = [lenv.Object (root_build_dir+'source/creator/%s_buildinfo'%build_type,
-                        [root_build_dir+'source/creator/buildinfo.c'])]
+                                    'BUILD_PLATFORM="%s:%s"'%(platform.system(), platform.architecture()[0])])
+
+        lenv.Append (CPPPATH = [root_build_dir+'source/blender/blenkernel'])
+
+        obj = [lenv.Object (root_build_dir+'source/creator/%s_buildinfo'%build_type, [root_build_dir+'source/creator/buildinfo.c'])]
+
     return obj
 
 ##### END LIB STUFF ############

Modified: branches/soc-2010-nicolasbishop/extern/bullet2/src/LinearMath/btQuickprof.cpp
===================================================================
--- branches/soc-2010-nicolasbishop/extern/bullet2/src/LinearMath/btQuickprof.cpp	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/extern/bullet2/src/LinearMath/btQuickprof.cpp	2010-10-18 02:43:53 UTC (rev 32549)
@@ -1,5 +1,5 @@
-/*
 
+
 /***************************************************************************************************
 **
 ** profile.cpp

Modified: branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemCocoa.mm	2010-10-18 02:43:53 UTC (rev 32549)
@@ -1059,6 +1059,8 @@
 					//Enforce only one resize message per event loop (coalescing all the live resize messages)					
 					window->updateDrawingContext();
 					pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowSize, window) );
+					//Mouse up event is trapped by the resizing event loop, so send it anyway to the window manager
+					pushEvent(new GHOST_EventButton(getMilliSeconds(), GHOST_kEventButtonUp, window, convertButton(0)));
 					m_ignoreWindowSizedMessages = true;
 				}
 				break;

Modified: branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm	2010-10-18 02:43:53 UTC (rev 32549)
@@ -493,10 +493,10 @@
     GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setTitle(): window invalid")
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-	NSString *windowTitle = [[NSString alloc] initWithUTF8String:title];
+	NSString *windowTitle = [[NSString alloc] initWithCString:title encoding:NSISOLatin1StringEncoding];
 	
 	//Set associated file if applicable
-	if ([windowTitle hasPrefix:@"Blender"])
+	if (windowTitle && [windowTitle hasPrefix:@"Blender"])
 	{
 		NSRange fileStrRange;
 		NSString *associatedFileName;
@@ -509,13 +509,16 @@
 		{
 			fileStrRange.length = len;
 			associatedFileName = [windowTitle substringWithRange:fileStrRange];
+			[m_window setTitle:[associatedFileName lastPathComponent]];
+
+			//Blender used file open/save functions converte file names into legal URL ones
+			associatedFileName = [associatedFileName stringByAddingPercentEscapesUsingEncoding:NSISOLatin1StringEncoding];
 			@try {
 				[m_window setRepresentedFilename:associatedFileName];
 			}
 			@catch (NSException * e) {
 				printf("\nInvalid file path given in window title");
 			}
-			[m_window setTitle:[associatedFileName lastPathComponent]];
 		}
 		else {
 			[m_window setTitle:windowTitle];

Modified: branches/soc-2010-nicolasbishop/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)

Modified: branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/path.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/path.py	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/path.py	2010-10-18 02:43:53 UTC (rev 32549)
@@ -52,6 +52,17 @@
     return path
 
 
+def is_subdir(path, directory):
+    """
+    Returns true if *path* in a subdirectory of *directory*.
+    Both paths must be absolute.
+    """
+    from os.path import normpath, normcase
+    path = normpath(normcase(path))
+    directory = normpath(normcase(directory))
+    return path.startswith(directory)
+
+
 def clean_name(name, replace="_"):
     """
     Returns a name with characters replaced that may cause problems under various circumstances, such as writing to a file.

Modified: branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py	2010-10-18 02:43:53 UTC (rev 32549)
@@ -27,7 +27,7 @@
 import os as _os
 import sys as _sys
 
-from _bpy import blend_paths
+from _bpy import blend_paths, user_resource
 from _bpy import script_paths as _bpy_script_paths
 
 
@@ -339,8 +339,15 @@
     loaded_default = module_name in _bpy.context.user_preferences.addons
 
     mod = _sys.modules.get(module_name)
-    loaded_state = mod and getattr(mod, "__addon_enabled__")
+    loaded_state = mod and getattr(mod, "__addon_enabled__", Ellipsis)
 
+    if loaded_state is Ellipsis:
+        print("Warning: addon-module %r found module but without"
+               " __addon_enabled__ field, possible name collision from file: %r" %
+               (module_name, getattr(mod, "__file__", "<unknown>")))
+
+        loaded_state = False
+
     return loaded_default, loaded_state
 
 

Modified: branches/soc-2010-nicolasbishop/release/scripts/op/animsys_update.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/op/animsys_update.py	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/release/scripts/op/animsys_update.py	2010-10-18 02:43:53 UTC (rev 32549)
@@ -674,6 +674,10 @@
     ("SequenceCrop", "top", "max_y"),
     ("SequenceCrop", "bottom", "min_x"),
     ("SequenceCrop", "left", "min_y"),
+    ("Sequence", "speed_fader", "speed_factor"),
+    ("SpeedControlSequence", "global_speed", "multiply_speed"),
+    ("SpeedControlSequence", "use_curve_velocity", "use_as_speed"),
+    ("SpeedControlSequence", "use_curve_compress_y", "scale_to_length"),
     ]
 
 

Modified: branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py	2010-10-18 02:43:53 UTC (rev 32549)
@@ -161,6 +161,10 @@
     stdout.truncate(0)
     stderr.truncate(0)
 
+    # special exception. its possible the command loaded a new user interface
+    if hash(sc) != hash(context.space_data):
+        return
+
     bpy.ops.console.scrollback_append(text=sc.prompt + line, type='INPUT')
 
     if is_multiline:

Modified: branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/export_obj.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/export_obj.py	2010-10-18 02:36:43 UTC (rev 32548)
+++ branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/export_obj.py	2010-10-18 02:43:53 UTC (rev 32549)
@@ -40,12 +40,16 @@
 
     def copy_image(image):
         fn = bpy.path.abspath(image.filepath)
+        fn = os.path.normpath(fn)
         fn_strip = os.path.basename(fn)
+
         if copy_images:
             rel = fn_strip
             fn_abs_dest = os.path.join(dest_dir, fn_strip)
             if not os.path.exists(fn_abs_dest):
                 shutil.copy(fn, fn_abs_dest)
+        elif bpy.path.is_subdir(fn, dest_dir):
+            rel = os.path.relpath(fn, dest_dir)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list