[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32272] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 32271.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Oct 3 13:33:34 CEST 2010
Revision: 32272
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32272
Author: kjym3
Date: 2010-10-03 13:33:32 +0200 (Sun, 03 Oct 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 32271.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32271
Modified Paths:
--------------
branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/op/animsys_update.py
branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
branches/soc-2008-mxcurioni/release/scripts/op/image.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/export_obj.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/text/readme.html
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_editVert.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/readimage.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_vec_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_screen.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_none.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.sh
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/buildinfo.c
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/bge.types.rst
Removed Paths:
-------------
branches/soc-2008-mxcurioni/projectfiles/
branches/soc-2008-mxcurioni/projectfiles_vc7/
branches/soc-2008-mxcurioni/projectfiles_vc9/
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py 2010-10-03 11:33:32 UTC (rev 32272)
@@ -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:
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-10-03 11:33:32 UTC (rev 32272)
@@ -987,6 +987,8 @@
return true;
}
+ m_ignoreWindowSizedMessages = false;
+
return anyProcessed;
}
@@ -1054,8 +1056,12 @@
case GHOST_kEventWindowSize:
if (!m_ignoreWindowSizedMessages)
{
+ //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;
default:
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-10-03 11:33:32 UTC (rev 32272)
@@ -280,6 +280,18 @@
return YES;
}
+- (void) drawRect:(NSRect)rect
+{
+ if ([self inLiveResize])
+ {
+ //Don't redraw while in live resize
+ }
+ else
+ {
+ [super drawRect:rect];
+ }
+}
+
@end
@@ -481,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;
@@ -497,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-2008-mxcurioni/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py 2010-10-03 11:33:32 UTC (rev 32272)
@@ -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-2008-mxcurioni/release/scripts/op/animsys_update.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/op/animsys_update.py 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/release/scripts/op/animsys_update.py 2010-10-03 11:33:32 UTC (rev 32272)
@@ -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-2008-mxcurioni/release/scripts/op/console_python.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/op/console_python.py 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/release/scripts/op/console_python.py 2010-10-03 11:33:32 UTC (rev 32272)
@@ -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-2008-mxcurioni/release/scripts/op/image.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/op/image.py 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/release/scripts/op/image.py 2010-10-03 11:33:32 UTC (rev 32272)
@@ -139,7 +139,7 @@
# filepath = bpy.path.clean_name(filepath) # fixes <memory> rubbish, needs checking
if filepath.startswith(".") or filepath == "":
- # TODO, have a way to check if the file is saved, assume .B25.blend
+ # TODO, have a way to check if the file is saved, assume startup.blend
tmpdir = context.user_preferences.filepaths.temporary_directory
filepath = os.path.join(tmpdir, "project_edit")
else:
Modified: branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/export_obj.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/export_obj.py 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/export_obj.py 2010-10-03 11:33:32 UTC (rev 32272)
@@ -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)
else:
rel = fn
Modified: branches/soc-2008-mxcurioni/release/scripts/op/wm.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/op/wm.py 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/release/scripts/op/wm.py 2010-10-03 11:33:32 UTC (rev 32272)
@@ -266,9 +266,9 @@
if value != eval("context.%s" % data_path):
# relies on rna clamping int's out of the range
if self.reverse:
- value = (1 << 32)
+ value = (1 << 31) - 1
else:
- value = - (1 << 32)
+ value = -1 << 31
exec("context.%s=value" % data_path)
Modified: branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_view3d.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_view3d.py 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_view3d.py 2010-10-03 11:33:32 UTC (rev 32272)
@@ -23,12 +23,15 @@
if event.type == 'MOUSEMOVE':
self.offset = (self._initial_mouse - Vector((event.mouse_x, event.mouse_y, 0.0))) * 0.02
self.execute(context)
+ context.area.header_text_set("Offset %.4f %.4f %.4f" % tuple(self.offset))
elif event.type == 'LEFTMOUSE':
+ context.area.header_text_set()
return {'FINISHED'}
elif event.type in ('RIGHTMOUSE', 'ESC'):
rv3d.view_location = self._initial_location
+ context.area.header_text_set()
return {'CANCELLED'}
return {'RUNNING_MODAL'}
Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py 2010-10-03 01:44:00 UTC (rev 32271)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py 2010-10-03 11:33:32 UTC (rev 32272)
@@ -69,7 +69,7 @@
col = split.column()
if cam.type == 'PERSP':
if cam.lens_unit == 'MILLIMETERS':
- col.prop(cam, "lens", text="Angle")
+ col.prop(cam, "lens")
elif cam.lens_unit == 'DEGREES':
col.prop(cam, "angle")
col = split.column()
Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py 2010-10-03 01:44:00 UTC (rev 32271)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list