Revision: 34460
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34460
Author: kjym3
Date: 2011-01-22 23:38:28 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 34459.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34459
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
branches/soc-2008-mxcurioni/doc/manpage/blender.1
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.h
branches/soc-2008-mxcurioni/intern/memutil/MEM_Allocator.h
branches/soc-2008-mxcurioni/intern/memutil/MEM_CacheLimiter.h
branches/soc-2008-mxcurioni/intern/memutil/MEM_CacheLimiterC-Api.h
branches/soc-2008-mxcurioni/intern/memutil/MEM_RefCounted.h
branches/soc-2008-mxcurioni/intern/memutil/MEM_RefCountedC-Api.h
branches/soc-2008-mxcurioni/release/bin/blender-thumbnailer.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_nla.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.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/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/report.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bpath.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.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_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_channels.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.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_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_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
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/divers.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_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_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_util.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.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/render/intern/source/rayobject_octree.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
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/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BlenderWorldInfo.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_WorldInfo.h
Added Paths:
-----------
branches/soc-2008-mxcurioni/extern/bullet2/uninitialized_stack_vec.patch
branches/soc-2008-mxcurioni/source/test/
branches/soc-2008-mxcurioni/source/test/CMakeLists.txt
branches/soc-2008-mxcurioni/source/test/bl_test.py
branches/soc-2008-mxcurioni/source/test/pep8.py
branches/soc-2008-mxcurioni/source/test/rna_array.py
branches/soc-2008-mxcurioni/source/test/rna_info_dump.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/release/scripts/op/io_shape_mdd/
branches/soc-2008-mxcurioni/release/test/
branches/soc-2008-mxcurioni/source/test/CMakeLists.txt
branches/soc-2008-mxcurioni/source/test/bl_test.py
branches/soc-2008-mxcurioni/source/test/pep8.py
branches/soc-2008-mxcurioni/source/test/rna_array.py
branches/soc-2008-mxcurioni/source/test/rna_info_dump.py
Property Changed:
----------------
branches/soc-2008-mxcurioni/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-34335
+ /trunk/blender:34011-34459
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-01-22 21:22:29 UTC (rev
34459)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-01-22 23:38:28 UTC (rev
34460)
@@ -50,6 +50,8 @@
project(Blender)
+enable_testing()
+
#-----------------------------------------------------------------------------
# Redirect output files
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-01-22 21:22:29 UTC (rev
34459)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-01-22 23:38:28 UTC (rev
34460)
@@ -28,6 +28,8 @@
# Main entry-point for the SCons building system
# Set up some custom actions and target/argument handling
# Then read all SConscripts and build
+#
+# TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds.
import platform as pltfrm
Modified:
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
2011-01-22 21:22:29 UTC (rev 34459)
+++ branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
2011-01-22 23:38:28 UTC (rev 34460)
@@ -141,6 +141,9 @@
sources_h.append(new_file)
elif is_c(new_file):
sources_c.append(new_file)
+ elif l in ("PARENT_SCOPE", ):
+ # cmake var, ignore
+ pass
else:
raise Exception("unknown file type - not c or h %s
-> %s" % (f, new_file))
Modified: branches/soc-2008-mxcurioni/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified:
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
===================================================================
---
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
2011-01-22 21:22:29 UTC (rev 34459)
+++
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
2011-01-22 23:38:28 UTC (rev 34460)
@@ -61,10 +61,12 @@
scaledAabbMin[0] = m_localScaling.getX() >= 0. ? aabbMin[0] *
invLocalScaling[0] : aabbMax[0] * invLocalScaling[0];
scaledAabbMin[1] = m_localScaling.getY() >= 0. ? aabbMin[1] *
invLocalScaling[1] : aabbMax[1] * invLocalScaling[1];
scaledAabbMin[2] = m_localScaling.getZ() >= 0. ? aabbMin[2] *
invLocalScaling[2] : aabbMax[2] * invLocalScaling[2];
+ scaledAabbMin[3] = 0.0; /* otherwise un-initialized stack memory:
uninitialized_stack_vec.patch, blender patch */
scaledAabbMax[0] = m_localScaling.getX() <= 0. ? aabbMin[0] *
invLocalScaling[0] : aabbMax[0] * invLocalScaling[0];
scaledAabbMax[1] = m_localScaling.getY() <= 0. ? aabbMin[1] *
invLocalScaling[1] : aabbMax[1] * invLocalScaling[1];
scaledAabbMax[2] = m_localScaling.getZ() <= 0. ? aabbMin[2] *
invLocalScaling[2] : aabbMax[2] * invLocalScaling[2];
+ scaledAabbMax[3] = 0.0; /* otherwise un-initialized stack memory:
uninitialized_stack_vec.patch, blender patch */
m_bvhTriMeshShape->processAllTriangles(&scaledCallback,scaledAabbMin,scaledAabbMax);
Copied:
branches/soc-2008-mxcurioni/extern/bullet2/uninitialized_stack_vec.patch (from
rev 34459, trunk/blender/extern/bullet2/uninitialized_stack_vec.patch)
===================================================================
--- branches/soc-2008-mxcurioni/extern/bullet2/uninitialized_stack_vec.patch
(rev 0)
+++ branches/soc-2008-mxcurioni/extern/bullet2/uninitialized_stack_vec.patch
2011-01-22 23:38:28 UTC (rev 34460)
@@ -0,0 +1,17 @@
+Index: src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
+===================================================================
+--- src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
(revision 34336)
++++ src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
(working copy)
+@@ -61,10 +61,12 @@
+ scaledAabbMin[0] = m_localScaling.getX() >= 0. ? aabbMin[0] *
invLocalScaling[0] : aabbMax[0] * invLocalScaling[0];
+ scaledAabbMin[1] = m_localScaling.getY() >= 0. ? aabbMin[1] *
invLocalScaling[1] : aabbMax[1] * invLocalScaling[1];
+ scaledAabbMin[2] = m_localScaling.getZ() >= 0. ? aabbMin[2] *
invLocalScaling[2] : aabbMax[2] * invLocalScaling[2];
++ scaledAabbMin[3] = 0.0; /* otherwise un-initialized stack memory:
uninitialized_stack_vec.patch, blender patch */
+
+ scaledAabbMax[0] = m_localScaling.getX() <= 0. ? aabbMin[0] *
invLocalScaling[0] : aabbMax[0] * invLocalScaling[0];
+ scaledAabbMax[1] = m_localScaling.getY() <= 0. ? aabbMin[1] *
invLocalScaling[1] : aabbMax[1] * invLocalScaling[1];
+ scaledAabbMax[2] = m_localScaling.getZ() <= 0. ? aabbMin[2] *
invLocalScaling[2] : aabbMax[2] * invLocalScaling[2];
++ scaledAabbMax[3] = 0.0; /* otherwise un-initialized stack memory:
uninitialized_stack_vec.patch, blender patch */
+
+
+
m_bvhTriMeshShape->processAllTriangles(&scaledCallback,scaledAabbMin,scaledAabbMax);
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
2011-01-22 21:22:29 UTC (rev 34459)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
2011-01-22 23:38:28 UTC (rev 34460)
@@ -1356,7 +1356,7 @@
if (confirmOpen == NSAlertAlternateReturn)
{
- filenameTextSize = [filepath
lengthOfBytesUsingEncoding:NSISOLatin1StringEncoding];
+ filenameTextSize = [filepath
lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
temp_buff = (char*) malloc(filenameTextSize+1);
@@ -1364,7 +1364,7 @@
return GHOST_kFailure;
}
- strncpy(temp_buff, [filepath
cStringUsingEncoding:NSISOLatin1StringEncoding], filenameTextSize);
+ strncpy(temp_buff, [filepath
cStringUsingEncoding:NSUTF8StringEncoding], filenameTextSize);
temp_buff[filenameTextSize] = '\0';
Modified:
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
2011-01-22 21:22:29 UTC (rev 34459)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
2011-01-22 23:38:28 UTC (rev 34460)
@@ -35,7 +35,30 @@
#include <windows.h>
#include <shlobj.h>
+#if defined(__MINGW32__) || defined(__CYGWIN__)
+#if !defined(SHARD_PIDL)
+#define SHARD_PIDL 0x00000001L
+#endif
+
+#if !defined(SHARD_PATHA)
+#define SHARD_PATHA 0x00000002L
+#endif
+
+#if !defined(SHARD_PATHA)
+#define SHARD_PATHW 0x00000003L
+#endif
+
+#if !defined(SHARD_PATH)
+#ifdef UNICODE
+#define SHARD_PATH SHARD_PATHW
+#else
+#define SHARD_PATH SHARD_PATHA
+#endif
+#endif
+
+#endif
+
GHOST_SystemPathsWin32::GHOST_SystemPathsWin32()
{
}
@@ -82,7 +105,6 @@
void GHOST_SystemPathsWin32::addToSystemRecentFiles(const char* filename) const
{
- /* SHARD_PATHA is for ansi strings, use SHARD_PATHW for wide */
- SHAddToRecentDocs(SHARD_PATHA,filename);
-
+ /* SHARD_PATH resolves to SHARD_PATHA for non-UNICODE build */
+ SHAddToRecentDocs(SHARD_PATH,filename);
}
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
2011-01-22 21:22:29 UTC (rev 34459)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
2011-01-22 23:38:28 UTC (rev 34460)
@@ -498,7 +498,7 @@
GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setTitle(): window invalid")
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- NSString *windowTitle = [[NSString alloc] initWithCString:title
encoding:NSISOLatin1StringEncoding];
+ NSString *windowTitle = [[NSString alloc] initWithCString:title
encoding:NSUTF8StringEncoding];
//Set associated file if applicable
if (windowTitle && [windowTitle hasPrefix:@"Blender"])
@@ -517,7 +517,7 @@
[m_window setTitle:[associatedFileName
lastPathComponent]];
//Blender used file open/save functions converte file
names into legal URL ones
- associatedFileName = [associatedFileName
stringByAddingPercentEscapesUsingEncoding:NSISOLatin1StringEncoding];
+ associatedFileName = [associatedFileName
stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
@try {
[m_window
setRepresentedFilename:associatedFileName];
}
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
2011-01-22 21:22:29 UTC (rev 34459)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
2011-01-22 23:38:28 UTC (rev 34460)
@@ -342,13 +342,15 @@
// we want this window treated.
XSizeHints * xsizehints = XAllocSizeHints();
- xsizehints->flags = PPosition | PSize | PMinSize;
+ xsizehints->flags = PPosition | PSize | PMinSize | PMaxSize;
xsizehints->x = left;
xsizehints->y = top;
xsizehints->width = width;
xsizehints->height = height;
xsizehints->min_width= 320; // size hints, could be made apart of
the ghost api
xsizehints->min_height= 240; // limits are also arbitrary, but
should not allow 1x1 window
+ xsizehints->max_width= 65535;
+ xsizehints->max_height= 65535;
XSetWMNormalHints(m_display, m_window, xsizehints);
XFree(xsizehints);
Modified: branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.h
2011-01-22 21:22:29 UTC (rev 34459)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
