[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28157] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28068 :28156
Brecht Van Lommel
brecht at blender.org
Tue Apr 13 10:10:24 CEST 2010
Revision: 28157
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28157
Author: blendix
Date: 2010-04-13 10:10:23 +0200 (Tue, 13 Apr 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28068:28156
Modified Paths:
--------------
branches/render25/CMakeLists.txt
branches/render25/intern/ghost/GHOST_ISystem.h
branches/render25/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/render25/intern/ghost/intern/GHOST_SystemCarbon.h
branches/render25/intern/ghost/intern/GHOST_SystemCocoa.h
branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/render25/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/render25/intern/ghost/intern/GHOST_SystemWin32.h
branches/render25/intern/ghost/intern/GHOST_SystemX11.cpp
branches/render25/intern/ghost/intern/GHOST_SystemX11.h
branches/render25/release/scripts/io/export_fbx.py
branches/render25/release/scripts/io/export_mdd.py
branches/render25/release/scripts/io/export_obj.py
branches/render25/release/scripts/io/export_x3d.py
branches/render25/release/scripts/io/import_anim_bvh.py
branches/render25/release/scripts/io/import_scene_3ds.py
branches/render25/release/scripts/io/import_scene_obj.py
branches/render25/release/scripts/modules/bpy_types.py
branches/render25/release/scripts/modules/rigify/__init__.py
branches/render25/release/scripts/modules/rigify/arm_biped.py
branches/render25/release/scripts/modules/rigify/eye_balls.py
branches/render25/release/scripts/modules/rigify/eye_lid.py
branches/render25/release/scripts/modules/rigify/finger_curl.py
branches/render25/release/scripts/modules/rigify/leg_biped.py
branches/render25/release/scripts/modules/rigify/leg_quadruped.py
branches/render25/release/scripts/modules/rigify/mouth.py
branches/render25/release/scripts/modules/rigify/neck_flex.py
branches/render25/release/scripts/modules/rigify/palm_curl.py
branches/render25/release/scripts/modules/rigify/spine_pivot_flex.py
branches/render25/release/scripts/modules/rigify/tail_control.py
branches/render25/release/scripts/modules/rigify_utils.py
branches/render25/release/scripts/modules/rna_info.py
branches/render25/release/scripts/op/add_armature_human.py
branches/render25/release/scripts/op/add_mesh_torus.py
branches/render25/release/scripts/op/console_python.py
branches/render25/release/scripts/op/fcurve_euler_filter.py
branches/render25/release/scripts/op/image.py
branches/render25/release/scripts/op/mesh.py
branches/render25/release/scripts/op/nla.py
branches/render25/release/scripts/op/object.py
branches/render25/release/scripts/op/object_align.py
branches/render25/release/scripts/op/object_randomize_transform.py
branches/render25/release/scripts/op/uvcalc_smart_project.py
branches/render25/release/scripts/op/vertexpaint_dirt.py
branches/render25/release/scripts/templates/gamelogic.py
branches/render25/release/scripts/ui/properties_data_mesh.py
branches/render25/release/scripts/ui/properties_particle.py
branches/render25/release/scripts/ui/properties_render.py
branches/render25/release/scripts/ui/properties_texture.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/Makefile
branches/render25/source/blender/CMakeLists.txt
branches/render25/source/blender/Makefile
branches/render25/source/blender/SConscript
branches/render25/source/blender/blenkernel/BKE_DerivedMesh.h
branches/render25/source/blender/blenkernel/BKE_customdata.h
branches/render25/source/blender/blenkernel/BKE_fcurve.h
branches/render25/source/blender/blenkernel/BKE_fluidsim.h
branches/render25/source/blender/blenkernel/BKE_multires.h
branches/render25/source/blender/blenkernel/BKE_shrinkwrap.h
branches/render25/source/blender/blenkernel/BKE_subsurf.h
branches/render25/source/blender/blenkernel/CMakeLists.txt
branches/render25/source/blender/blenkernel/SConscript
branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
branches/render25/source/blender/blenkernel/intern/Makefile
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/colortools.c
branches/render25/source/blender/blenkernel/intern/constraint.c
branches/render25/source/blender/blenkernel/intern/customdata.c
branches/render25/source/blender/blenkernel/intern/fcurve.c
branches/render25/source/blender/blenkernel/intern/fluidsim.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/multires.c
branches/render25/source/blender/blenkernel/intern/particle_system.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/collada/DocumentImporter.cpp
branches/render25/source/blender/editors/animation/drivers.c
branches/render25/source/blender/editors/armature/poselib.c
branches/render25/source/blender/editors/armature/poseobject.c
branches/render25/source/blender/editors/interface/interface_draw.c
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/interface/interface_panel.c
branches/render25/source/blender/editors/interface/interface_regions.c
branches/render25/source/blender/editors/mesh/editmesh_lib.c
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_constraint.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/object/object_intern.h
branches/render25/source/blender/editors/object/object_modifier.c
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/object/object_vgroup.c
branches/render25/source/blender/editors/render/render_internal.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_node/drawnode.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_node/node_intern.h
branches/render25/source/blender/editors/space_node/node_ops.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/view3d_header.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/editors/transform/transform_generics.c
branches/render25/source/blender/editors/transform/transform_ops.c
branches/render25/source/blender/gpu/intern/gpu_draw.c
branches/render25/source/blender/imbuf/intern/anim.c
branches/render25/source/blender/makesdna/DNA_color_types.h
branches/render25/source/blender/makesdna/DNA_particle_types.h
branches/render25/source/blender/makesdna/DNA_scene_types.h
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesrna/SConscript
branches/render25/source/blender/makesrna/intern/CMakeLists.txt
branches/render25/source/blender/makesrna/intern/Makefile
branches/render25/source/blender/makesrna/intern/SConscript
branches/render25/source/blender/makesrna/intern/rna_animation_api.c
branches/render25/source/blender/makesrna/intern/rna_curve.c
branches/render25/source/blender/makesrna/intern/rna_mesh.c
branches/render25/source/blender/makesrna/intern/rna_meta.c
branches/render25/source/blender/makesrna/intern/rna_particle.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/python/doc/epy/Geometry.py
branches/render25/source/blender/python/doc/epy/Mathutils.py
branches/render25/source/blender/python/doc/sphinx_doc_gen.py
branches/render25/source/blender/python/intern/bpy.c
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/quicktime/CMakeLists.txt
branches/render25/source/blender/quicktime/SConscript
branches/render25/source/blender/quicktime/apple/Makefile
branches/render25/source/blender/quicktime/apple/qtkit_export.m
branches/render25/source/blender/quicktime/apple/quicktime_export.c
branches/render25/source/blender/quicktime/quicktime_export.h
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/render25/source/creator/CMakeLists.txt
branches/render25/source/creator/creator.c
branches/render25/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/render25/source/gameengine/Converter/KX_IpoConvert.cpp
branches/render25/source/gameengine/Expressions/PyObjectPlus.h
branches/render25/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/render25/source/gameengine/Ketsji/KX_PyMath.h
branches/render25/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/render25/source/gameengine/PyDoc/API_intro.py
branches/render25/source/gameengine/PyDoc/GameTypes.py
branches/render25/source/gameengine/VideoTexture/ImageBuff.cpp
Added Paths:
-----------
branches/render25/release/scripts/modules/rigify/neck.py
branches/render25/release/scripts/modules/rigify/tongue.py
branches/render25/source/blender/modifiers/
branches/render25/source/blender/modifiers/CMakeLists.txt
branches/render25/source/blender/modifiers/MOD_modifiertypes.h
branches/render25/source/blender/modifiers/Makefile
branches/render25/source/blender/modifiers/SConscript
branches/render25/source/blender/modifiers/intern/
branches/render25/source/blender/modifiers/intern/MOD_armature.c
branches/render25/source/blender/modifiers/intern/MOD_array.c
branches/render25/source/blender/modifiers/intern/MOD_bevel.c
branches/render25/source/blender/modifiers/intern/MOD_boolean.c
branches/render25/source/blender/modifiers/intern/MOD_boolean_util.c
branches/render25/source/blender/modifiers/intern/MOD_boolean_util.h
branches/render25/source/blender/modifiers/intern/MOD_build.c
branches/render25/source/blender/modifiers/intern/MOD_cast.c
branches/render25/source/blender/modifiers/intern/MOD_cloth.c
branches/render25/source/blender/modifiers/intern/MOD_collision.c
branches/render25/source/blender/modifiers/intern/MOD_curve.c
branches/render25/source/blender/modifiers/intern/MOD_decimate.c
branches/render25/source/blender/modifiers/intern/MOD_displace.c
branches/render25/source/blender/modifiers/intern/MOD_edgesplit.c
branches/render25/source/blender/modifiers/intern/MOD_explode.c
branches/render25/source/blender/modifiers/intern/MOD_fluidsim.c
branches/render25/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/render25/source/blender/modifiers/intern/MOD_fluidsim_util.h
branches/render25/source/blender/modifiers/intern/MOD_hook.c
branches/render25/source/blender/modifiers/intern/MOD_lattice.c
branches/render25/source/blender/modifiers/intern/MOD_mask.c
branches/render25/source/blender/modifiers/intern/MOD_meshdeform.c
branches/render25/source/blender/modifiers/intern/MOD_mirror.c
branches/render25/source/blender/modifiers/intern/MOD_multires.c
branches/render25/source/blender/modifiers/intern/MOD_none.c
branches/render25/source/blender/modifiers/intern/MOD_particleinstance.c
branches/render25/source/blender/modifiers/intern/MOD_particlesystem.c
branches/render25/source/blender/modifiers/intern/MOD_screw.c
branches/render25/source/blender/modifiers/intern/MOD_shapekey.c
branches/render25/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/render25/source/blender/modifiers/intern/MOD_simpledeform.c
branches/render25/source/blender/modifiers/intern/MOD_smoke.c
branches/render25/source/blender/modifiers/intern/MOD_smooth.c
branches/render25/source/blender/modifiers/intern/MOD_softbody.c
branches/render25/source/blender/modifiers/intern/MOD_solidify.c
branches/render25/source/blender/modifiers/intern/MOD_subsurf.c
branches/render25/source/blender/modifiers/intern/MOD_surface.c
branches/render25/source/blender/modifiers/intern/MOD_util.c
branches/render25/source/blender/modifiers/intern/MOD_util.h
branches/render25/source/blender/modifiers/intern/MOD_uvproject.c
branches/render25/source/blender/modifiers/intern/MOD_wave.c
branches/render25/source/blender/modifiers/intern/Makefile
branches/render25/source/blender/python/doc/examples/mathutils.Euler.py
branches/render25/source/blender/python/doc/examples/mathutils.Matrix.py
branches/render25/source/blender/python/doc/examples/mathutils.Quaternion.py
branches/render25/source/blender/python/doc/examples/mathutils.Vector.py
branches/render25/source/blender/python/doc/examples/mathutils.py
branches/render25/source/blender/python/generic/blf_api.c
branches/render25/source/blender/python/generic/blf_api.h
branches/render25/source/blender/python/generic/geometry.c
branches/render25/source/blender/python/generic/geometry.h
branches/render25/source/blender/python/generic/mathutils.c
branches/render25/source/blender/python/generic/mathutils.h
branches/render25/source/blender/python/generic/mathutils_color.c
branches/render25/source/blender/python/generic/mathutils_color.h
branches/render25/source/blender/python/generic/mathutils_euler.c
branches/render25/source/blender/python/generic/mathutils_euler.h
branches/render25/source/blender/python/generic/mathutils_matrix.c
branches/render25/source/blender/python/generic/mathutils_matrix.h
branches/render25/source/blender/python/generic/mathutils_quat.c
branches/render25/source/blender/python/generic/mathutils_quat.h
branches/render25/source/blender/python/generic/mathutils_vector.c
branches/render25/source/blender/python/generic/mathutils_vector.h
branches/render25/source/blender/render/intern/source/ray_trace.c
Removed Paths:
-------------
branches/render25/make/pb_2_0_1/
branches/render25/make/xc_blender/
branches/render25/source/blender/blenkernel/BKE_booleanops.h
branches/render25/source/blender/blenkernel/BKE_simple_deform.h
branches/render25/source/blender/blenkernel/intern/booleanops.c
branches/render25/source/blender/blenkernel/intern/simple_deform.c
branches/render25/source/blender/modifiers/CMakeLists.txt
branches/render25/source/blender/modifiers/MOD_modifiertypes.h
branches/render25/source/blender/modifiers/Makefile
branches/render25/source/blender/modifiers/SConscript
branches/render25/source/blender/modifiers/intern/
branches/render25/source/blender/modifiers/intern/MOD_armature.c
branches/render25/source/blender/modifiers/intern/MOD_array.c
branches/render25/source/blender/modifiers/intern/MOD_bevel.c
branches/render25/source/blender/modifiers/intern/MOD_boolean.c
branches/render25/source/blender/modifiers/intern/MOD_boolean_util.c
branches/render25/source/blender/modifiers/intern/MOD_boolean_util.h
branches/render25/source/blender/modifiers/intern/MOD_build.c
branches/render25/source/blender/modifiers/intern/MOD_cast.c
branches/render25/source/blender/modifiers/intern/MOD_cloth.c
branches/render25/source/blender/modifiers/intern/MOD_collision.c
branches/render25/source/blender/modifiers/intern/MOD_curve.c
branches/render25/source/blender/modifiers/intern/MOD_decimate.c
branches/render25/source/blender/modifiers/intern/MOD_displace.c
branches/render25/source/blender/modifiers/intern/MOD_edgesplit.c
branches/render25/source/blender/modifiers/intern/MOD_explode.c
branches/render25/source/blender/modifiers/intern/MOD_fluidsim.c
branches/render25/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/render25/source/blender/modifiers/intern/MOD_fluidsim_util.h
branches/render25/source/blender/modifiers/intern/MOD_hook.c
branches/render25/source/blender/modifiers/intern/MOD_lattice.c
branches/render25/source/blender/modifiers/intern/MOD_mask.c
branches/render25/source/blender/modifiers/intern/MOD_meshdeform.c
branches/render25/source/blender/modifiers/intern/MOD_mirror.c
branches/render25/source/blender/modifiers/intern/MOD_multires.c
branches/render25/source/blender/modifiers/intern/MOD_none.c
branches/render25/source/blender/modifiers/intern/MOD_particleinstance.c
branches/render25/source/blender/modifiers/intern/MOD_particlesystem.c
branches/render25/source/blender/modifiers/intern/MOD_screw.c
branches/render25/source/blender/modifiers/intern/MOD_shapekey.c
branches/render25/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/render25/source/blender/modifiers/intern/MOD_simpledeform.c
branches/render25/source/blender/modifiers/intern/MOD_smoke.c
branches/render25/source/blender/modifiers/intern/MOD_smooth.c
branches/render25/source/blender/modifiers/intern/MOD_softbody.c
branches/render25/source/blender/modifiers/intern/MOD_solidify.c
branches/render25/source/blender/modifiers/intern/MOD_subsurf.c
branches/render25/source/blender/modifiers/intern/MOD_surface.c
branches/render25/source/blender/modifiers/intern/MOD_util.c
branches/render25/source/blender/modifiers/intern/MOD_util.h
branches/render25/source/blender/modifiers/intern/MOD_uvproject.c
branches/render25/source/blender/modifiers/intern/MOD_wave.c
branches/render25/source/blender/modifiers/intern/Makefile
branches/render25/source/blender/python/doc/examples/Mathutils.Euler.py
branches/render25/source/blender/python/doc/examples/Mathutils.Matrix.py
branches/render25/source/blender/python/doc/examples/Mathutils.Quaternion.py
branches/render25/source/blender/python/doc/examples/Mathutils.Vector.py
branches/render25/source/blender/python/doc/examples/Mathutils.py
branches/render25/source/blender/python/generic/Geometry.c
branches/render25/source/blender/python/generic/Geometry.h
branches/render25/source/blender/python/generic/Mathutils.c
branches/render25/source/blender/python/generic/Mathutils.h
branches/render25/source/blender/python/generic/blf.c
branches/render25/source/blender/python/generic/blf.h
branches/render25/source/blender/python/generic/euler.c
branches/render25/source/blender/python/generic/euler.h
branches/render25/source/blender/python/generic/matrix.c
branches/render25/source/blender/python/generic/matrix.h
branches/render25/source/blender/python/generic/quat.c
branches/render25/source/blender/python/generic/quat.h
branches/render25/source/blender/python/generic/vector.c
branches/render25/source/blender/python/generic/vector.h
Modified: branches/render25/CMakeLists.txt
===================================================================
--- branches/render25/CMakeLists.txt 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/CMakeLists.txt 2010-04-13 08:10:23 UTC (rev 28157)
@@ -42,7 +42,7 @@
")
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(Blender)
#-----------------------------------------------------------------------------
Modified: branches/render25/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/render25/intern/ghost/GHOST_ISystem.h 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/intern/ghost/GHOST_ISystem.h 2010-04-13 08:10:23 UTC (rev 28157)
@@ -331,7 +331,7 @@
* @param y The y-coordinate of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const = 0;
+ virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) = 0;
/***************************************************************************************
** Access to mouse button and keyboard states.
Modified: branches/render25/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemCarbon.cpp 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/intern/ghost/intern/GHOST_SystemCarbon.cpp 2010-04-13 08:10:23 UTC (rev 28157)
@@ -531,7 +531,7 @@
}
-GHOST_TSuccess GHOST_SystemCarbon::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const
+GHOST_TSuccess GHOST_SystemCarbon::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
{
float xf=(float)x, yf=(float)y;
Modified: branches/render25/intern/ghost/intern/GHOST_SystemCarbon.h
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemCarbon.h 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/intern/ghost/intern/GHOST_SystemCarbon.h 2010-04-13 08:10:23 UTC (rev 28157)
@@ -156,7 +156,7 @@
* @param y The y-coordinate of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const;
+ virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
/***************************************************************************************
** Access to mouse button and keyboard states.
Modified: branches/render25/intern/ghost/intern/GHOST_SystemCocoa.h
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemCocoa.h 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/intern/ghost/intern/GHOST_SystemCocoa.h 2010-04-13 08:10:23 UTC (rev 28157)
@@ -179,8 +179,8 @@
* @param y The y-coordinate of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const;
-
+ virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
+
/***************************************************************************************
** Access to mouse button and keyboard states.
***************************************************************************************/
@@ -272,6 +272,14 @@
*/
GHOST_TSuccess handleKeyEvent(void *eventPtr);
+ /**
+ * Performs the actual cursor position update (location in screen coordinates).
+ * @param x The x-coordinate of the cursor.
+ * @param y The y-coordinate of the cursor.
+ * @return Indication of success.
+ */
+ GHOST_TSuccess setMouseCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
+
/** Start time at initialization. */
GHOST_TUns64 m_start_time;
Modified: branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-04-13 08:10:23 UTC (rev 28157)
@@ -807,8 +807,24 @@
/**
* @note : expect Cocoa screen coordinates
*/
-GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const
+GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
{
+ GHOST_TInt32 wx,wy;
+ GHOST_WindowCocoa* window = (GHOST_WindowCocoa*)m_windowManager->getActiveWindow();
+ if (!window) return GHOST_kFailure;
+
+ setMouseCursorPosition(x, y);
+
+ //Force mouse move event (not pushed by Cocoa)
+ window->screenToClient(x, y, wx, wy);
+ pushEvent(new GHOST_EventCursor(getMilliSeconds(), GHOST_kEventCursorMove, window, wx,wy));
+ m_outsideLoopEventProcessed = true;
+
+ return GHOST_kSuccess;
+}
+
+GHOST_TSuccess GHOST_SystemCocoa::setMouseCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
+{
float xf=(float)x, yf=(float)y;
GHOST_WindowCocoa* window = (GHOST_WindowCocoa*)m_windowManager->getActiveWindow();
if (!window) return GHOST_kFailure;
@@ -1517,7 +1533,7 @@
//Set new cursor position
window->clientToScreen(x_mouse, y_mouse, x_cur, y_cur);
- setCursorPosition(x_cur, y_cur); /* wrap */
+ setMouseCursorPosition(x_cur, y_cur); /* wrap */
//Post event
window->getCursorGrabInitPos(x_cur, y_cur);
Modified: branches/render25/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-04-13 08:10:23 UTC (rev 28157)
@@ -273,7 +273,7 @@
}
-GHOST_TSuccess GHOST_SystemWin32::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const
+GHOST_TSuccess GHOST_SystemWin32::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
{
return ::SetCursorPos(x, y) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
}
Modified: branches/render25/intern/ghost/intern/GHOST_SystemWin32.h
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemWin32.h 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/intern/ghost/intern/GHOST_SystemWin32.h 2010-04-13 08:10:23 UTC (rev 28157)
@@ -153,7 +153,7 @@
* @param y The y-coordinate of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const;
+ virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
/***************************************************************************************
** Access to mouse button and keyboard states.
Modified: branches/render25/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemX11.cpp 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/intern/ghost/intern/GHOST_SystemX11.cpp 2010-04-13 08:10:23 UTC (rev 28157)
@@ -970,7 +970,7 @@
setCursorPosition(
GHOST_TInt32 x,
GHOST_TInt32 y
-) const {
+) {
// This is a brute force move in screen coordinates
// XWarpPointer does relative moves so first determine the
Modified: branches/render25/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemX11.h 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/intern/ghost/intern/GHOST_SystemX11.h 2010-04-13 08:10:23 UTC (rev 28157)
@@ -158,7 +158,7 @@
setCursorPosition(
GHOST_TInt32 x,
GHOST_TInt32 y
- ) const;
+ );
/**
* Returns the state of all modifier keys.
Modified: branches/render25/release/scripts/io/export_fbx.py
===================================================================
--- branches/render25/release/scripts/io/export_fbx.py 2010-04-13 06:06:49 UTC (rev 28156)
+++ branches/render25/release/scripts/io/export_fbx.py 2010-04-13 08:10:23 UTC (rev 28157)
@@ -77,7 +77,7 @@
# import Blender
import bpy
-import Mathutils
+import mathutils
@@ -135,7 +135,7 @@
# I guess FBX uses degrees instead of radians (Arystan).
# Call this function just before writing to FBX.
def eulerRadToDeg(eul):
- ret = Mathutils.Euler()
+ ret = mathutils.Euler()
ret.x = 180 / math.pi * eul[0]
ret.y = 180 / math.pi * eul[1]
@@ -143,10 +143,10 @@
return ret
-mtx4_identity = Mathutils.Matrix()
+mtx4_identity = mathutils.Matrix()
# testing
-mtx_x90 = Mathutils.RotationMatrix( math.pi/2, 3, 'X') # used
+mtx_x90 = mathutils.RotationMatrix( math.pi/2, 3, 'X') # used
#mtx_x90n = RotationMatrix(-90, 3, 'x')
#mtx_y90 = RotationMatrix( 90, 3, 'y')
#mtx_y90n = RotationMatrix(-90, 3, 'y')
@@ -154,11 +154,11 @@
#mtx_z90n = RotationMatrix(-90, 3, 'z')
#mtx4_x90 = RotationMatrix( 90, 4, 'x')
-mtx4_x90n = Mathutils.RotationMatrix(-math.pi/2, 4, 'X') # used
+mtx4_x90n = mathutils.RotationMatrix(-math.pi/2, 4, 'X') # used
#mtx4_y90 = RotationMatrix( 90, 4, 'y')
-mtx4_y90n = Mathutils.RotationMatrix(-math.pi/2, 4, 'Y') # used
-mtx4_z90 = Mathutils.RotationMatrix( math.pi/2, 4, 'Z') # used
-mtx4_z90n = Mathutils.RotationMatrix(-math.pi/2, 4, 'Z') # used
+mtx4_y90n = mathutils.RotationMatrix(-math.pi/2, 4, 'Y') # used
+mtx4_z90 = mathutils.RotationMatrix( math.pi/2, 4, 'Z') # used
+mtx4_z90n = mathutils.RotationMatrix(-math.pi/2, 4, 'Z') # used
# def strip_path(p):
# return p.split('\\')[-1].split('/')[-1]
@@ -333,7 +333,7 @@
EXP_CAMERA = True,
EXP_EMPTY = True,
EXP_IMAGE_COPY = False,
- GLOBAL_MATRIX = Mathutils.Matrix(),
+ GLOBAL_MATRIX = mathutils.Matrix(),
ANIM_ENABLE = True,
ANIM_OPTIMIZE = True,
ANIM_OPTIMIZE_PRECISSION = 6,
@@ -600,8 +600,8 @@
matrix_rot = matrix_rot * mtx_x90
elif type =='CAMERA':
# elif ob and type =='Camera':
- y = matrix_rot * Mathutils.Vector(0,1,0)
- matrix_rot = Mathutils.RotationMatrix(math.pi/2, 3, y) * matrix_rot
+ y = matrix_rot * mathutils.Vector(0,1,0)
+ matrix_rot = mathutils.RotationMatrix(math.pi/2, 3, y) * matrix_rot
return matrix_rot
@@ -702,8 +702,8 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list