[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47025] branches/meshdata_transfer: svn merge ^/trunk/blender -r46930:HEAD

Ove Murberg Henriksen sorayasilvermoon at hotmail.com
Fri May 25 19:52:51 CEST 2012 

Revision: 47025
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47025
Author:   cyborgmuppet
Date:     2012-05-25 17:52:51 +0000 (Fri, 25 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46930:HEAD

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46930

Modified Paths:
--------------
    branches/meshdata_transfer/CMakeLists.txt
    branches/meshdata_transfer/doc/python_api/rst/bge.render.rst
    branches/meshdata_transfer/intern/cycles/render/graph.cpp
    branches/meshdata_transfer/intern/ghost/CMakeLists.txt
    branches/meshdata_transfer/intern/ghost/GHOST_ISystemPaths.h
    branches/meshdata_transfer/intern/ghost/GHOST_Path-api.h
    branches/meshdata_transfer/intern/ghost/intern/GHOST_Path-api.cpp
    branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPaths.h
    branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
    branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsCarbon.h
    branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsCocoa.h
    branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
    branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsWin32.h
    branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPathsX11.h
    branches/meshdata_transfer/intern/ghost/test/gears/GHOST_C-Test.c
    branches/meshdata_transfer/intern/ghost/test/gears/GHOST_Test.cpp
    branches/meshdata_transfer/intern/ghost/test/multitest/Basic.c
    branches/meshdata_transfer/intern/ghost/test/multitest/MultiTest.c
    branches/meshdata_transfer/intern/ghost/test/multitest/ScrollBar.c
    branches/meshdata_transfer/intern/ghost/test/multitest/Util.c
    branches/meshdata_transfer/intern/ghost/test/multitest/WindowData.c
    branches/meshdata_transfer/intern/smoke/intern/FLUID_3D.cpp
    branches/meshdata_transfer/release/plugins/sequence/blur.c
    branches/meshdata_transfer/release/plugins/sequence/dnr.c
    branches/meshdata_transfer/release/plugins/sequence/scatter.c
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_material.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_texture.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_graph.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
    branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_fcurve.h
    branches/meshdata_transfer/source/blender/blenkernel/intern/blender.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/deform.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/fcurve.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/movieclip.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/particle_system.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/pointcache.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/smoke.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/softbody.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/tracking.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/unit.c
    branches/meshdata_transfer/source/blender/blenlib/CMakeLists.txt
    branches/meshdata_transfer/source/blender/blenlib/intern/noise.c
    branches/meshdata_transfer/source/blender/blenlib/intern/path_util.c
    branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
    branches/meshdata_transfer/source/blender/blenloader/intern/readfile.h
    branches/meshdata_transfer/source/blender/blenloader/intern/versioning_250.c
    branches/meshdata_transfer/source/blender/bmesh/operators/bmo_slide.c
    branches/meshdata_transfer/source/blender/collada/ExportSettings.h
    branches/meshdata_transfer/source/blender/collada/SceneExporter.cpp
    branches/meshdata_transfer/source/blender/collada/collada.cpp
    branches/meshdata_transfer/source/blender/collada/collada.h
    branches/meshdata_transfer/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_InputSocket.cpp
    branches/meshdata_transfer/source/blender/compositor/intern/COM_InputSocket.h
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_BrightnessNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorRampNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_CropNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DefocusNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DisplaceNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FilterNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_FlipNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GammaNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GlareNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_IDMaskNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_InvertNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapUVNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MapValueNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MathNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_NormalizeNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_RotateNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_SwitchNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TextureNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TonemapNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TransformNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_TranslateNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/meshdata_transfer/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_LensGhostOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/meshdata_transfer/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/meshdata_transfer/source/blender/editors/animation/anim_channels_defines.c
    branches/meshdata_transfer/source/blender/editors/armature/editarmature.c
    branches/meshdata_transfer/source/blender/editors/curve/editcurve.c
    branches/meshdata_transfer/source/blender/editors/include/ED_armature.h
    branches/meshdata_transfer/source/blender/editors/include/ED_curve.h
    branches/meshdata_transfer/source/blender/editors/include/ED_mball.h
    branches/meshdata_transfer/source/blender/editors/include/ED_mesh.h
    branches/meshdata_transfer/source/blender/editors/include/ED_object.h
    branches/meshdata_transfer/source/blender/editors/include/ED_particle.h
    branches/meshdata_transfer/source/blender/editors/include/ED_screen.h
    branches/meshdata_transfer/source/blender/editors/include/UI_interface.h
    branches/meshdata_transfer/source/blender/editors/interface/interface.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_handlers.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_intern.h
    branches/meshdata_transfer/source/blender/editors/interface/interface_templates.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_widgets.c
    branches/meshdata_transfer/source/blender/editors/mesh/editface.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_select.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
    branches/meshdata_transfer/source/blender/editors/metaball/mball_edit.c
    branches/meshdata_transfer/source/blender/editors/object/object_lattice.c
    branches/meshdata_transfer/source/blender/editors/object/object_modifier.c
    branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
    branches/meshdata_transfer/source/blender/editors/physics/dynamicpaint_ops.c
    branches/meshdata_transfer/source/blender/editors/physics/particle_edit.c
    branches/meshdata_transfer/source/blender/editors/physics/physics_fluid.c
    branches/meshdata_transfer/source/blender/editors/render/render_internal.c
    branches/meshdata_transfer/source/blender/editors/screen/screen_edit.c
    branches/meshdata_transfer/source/blender/editors/screen/screen_ops.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/meshdata_transfer/source/blender/editors/sound/sound_ops.c
    branches/meshdata_transfer/source/blender/editors/space_clip/clip_ops.c
    branches/meshdata_transfer/source/blender/editors/space_clip/tracking_ops.c
    branches/meshdata_transfer/source/blender/editors/space_graph/graph_edit.c
    branches/meshdata_transfer/source/blender/editors/space_graph/graph_intern.h
    branches/meshdata_transfer/source/blender/editors/space_graph/space_graph.c
    branches/meshdata_transfer/source/blender/editors/space_node/node_buttons.c
    branches/meshdata_transfer/source/blender/editors/space_node/node_templates.c
    branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/meshdata_transfer/source/blender/editors/space_text/space_text.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/drawarmature.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/drawvolume.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_draw.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_fly.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_ops.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_select.c
    branches/meshdata_transfer/source/blender/editors/transform/transform_conversions.c
    branches/meshdata_transfer/source/blender/editors/transform/transform_generics.c
    branches/meshdata_transfer/source/blender/editors/transform/transform_snap.c
    branches/meshdata_transfer/source/blender/editors/util/editmode_undo.c
    branches/meshdata_transfer/source/blender/gpu/intern/gpu_codegen.c
    branches/meshdata_transfer/source/blender/gpu/intern/gpu_draw.c
    branches/meshdata_transfer/source/blender/gpu/intern/gpu_extensions.c
    branches/meshdata_transfer/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logImageLib.c
    branches/meshdata_transfer/source/blender/imbuf/intern/radiance_hdr.c
    branches/meshdata_transfer/source/blender/makesdna/DNA_action_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_smoke_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_space_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_view3d_types.h
    branches/meshdata_transfer/source/blender/makesdna/intern/makesdna.c
    branches/meshdata_transfer/source/blender/makesrna/RNA_enum_types.h
    branches/meshdata_transfer/source/blender/makesrna/intern/makesrna.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_action.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_image_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_internal.h
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_pose.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_screen.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_space.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_userdef.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_skin.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_solidify.c
    branches/meshdata_transfer/source/blender/nodes/composite/node_composite_tree.c
    branches/meshdata_transfer/source/blender/python/intern/bpy_interface.c
    branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
    branches/meshdata_transfer/source/blender/render/intern/source/rendercore.c
    branches/meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
    branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
    branches/meshdata_transfer/source/blender/windowmanager/intern/wm_window.c
    branches/meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c

Added Paths:
-----------
    branches/meshdata_transfer/release/scripts/presets/operator/
    branches/meshdata_transfer/release/scripts/presets/operator/wm.collada_export/
    branches/meshdata_transfer/release/scripts/presets/operator/wm.collada_export/second_life.py
    branches/meshdata_transfer/source/tools/codereview_upload.py

Removed Paths:
-------------
    branches/meshdata_transfer/release/scripts/presets/operator/wm.collada_export/
    branches/meshdata_transfer/release/scripts/presets/operator/wm.collada_export/second_life.py

Property Changed:
----------------
    branches/meshdata_transfer/
    branches/meshdata_transfer/source/blender/editors/interface/interface.c
    branches/meshdata_transfer/source/blender/editors/space_outliner/


Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46930
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-47023

Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt	2012-05-25 17:44:37 UTC (rev 47024)
+++ branches/meshdata_transfer/CMakeLists.txt	2012-05-25 17:52:51 UTC (rev 47025)
@@ -161,8 +161,6 @@
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
 	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	ON)
 	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
-	option(WITH_XDG_USER_DIRS    "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
-	mark_as_advanced(WITH_XDG_USER_DIRS)
 
 	# freebsd doesn't seems to support XDND
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")

Modified: branches/meshdata_transfer/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/meshdata_transfer/doc/python_api/rst/bge.render.rst	2012-05-25 17:44:37 UTC (rev 47024)
+++ branches/meshdata_transfer/doc/python_api/rst/bge.render.rst	2012-05-25 17:52:51 UTC (rev 47025)
@@ -11,39 +11,41 @@
 .. code-block:: python
 
    # Example Uses an L{SCA_MouseSensor}, and two L{KX_ObjectActuator}s to implement MouseLook::
-   # To use a mouse movement sensor "Mouse" and a 
+   # To use a mouse movement sensor "Mouse" and a
    # motion actuator to mouse look:
-   import bge.render
-   import bge.logic
+   import bge
 
    # scale sets the speed of motion
    scale = 1.0, 0.5
-   
+
    co = bge.logic.getCurrentController()
-   obj = co.getOwner()
-   mouse = co.getSensor("Mouse")
-   lmotion = co.getActuator("LMove")
-   wmotion = co.getActuator("WMove")
-   
+   obj = co.owner
+   mouse = co.sensors["Mouse"]
+   lmotion = co.actuators["LMove"]
+   wmotion = co.actuators["WMove"]
+
    # Transform the mouse coordinates to see how far the mouse has moved.
    def mousePos():
-      x = (bge.render.getWindowWidth() / 2 - mouse.getXPosition()) * scale[0]
-      y = (bge.render.getWindowHeight() / 2 - mouse.getYPosition()) * scale[1]
+      x = (bge.render.getWindowWidth() / 2 - mouse.position[0]) * scale[0]
+      y = (bge.render.getWindowHeight() / 2 - mouse.position[1]) * scale[1]
       return (x, y)
-   
+
    pos = mousePos()
-   
+
    # Set the amount of motion: X is applied in world coordinates...
-   lmotion.setTorque(0.0, 0.0, pos[0], False)
+   wmotion.useLocalTorque = False
+   wmotion.torque = ((0.0, 0.0, pos[0]))
+
    # ...Y is applied in local coordinates
-   wmotion.setTorque(-pos[1], 0.0, 0.0, True)
-   
+   lmotion.useLocalTorque = True
+   lmotion.torque = ((-pos[1], 0.0, 0.0))
+
    # Activate both actuators
-   bge.logic.addActiveActuator(lmotion, True)
-   bge.logic.addActiveActuator(wmotion, True)
-   
+   co.activate(lmotion)
+   co.activate(wmotion)
+
    # Centre the mouse
-   bge.render.setMousePosition(bge.render.getWindowWidth() / 2, bge.render.getWindowHeight() / 2)
+   bge.render.setMousePosition(int(bge.render.getWindowWidth() / 2), int(bge.render.getWindowHeight() / 2))
 
 *********
 Constants

Modified: branches/meshdata_transfer/intern/cycles/render/graph.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/render/graph.cpp	2012-05-25 17:44:37 UTC (rev 47024)
+++ branches/meshdata_transfer/intern/cycles/render/graph.cpp	2012-05-25 17:52:51 UTC (rev 47025)
@@ -325,6 +325,25 @@
 			
 			removed[proxy->id] = true;
 		}
+
+		/* remove useless mix closures nodes */
+		MixClosureNode *mix = dynamic_cast<MixClosureNode*>(node);
+
+		if(mix) {
+			if(mix->outputs[0]->links.size() && mix->inputs[1]->link == mix->inputs[2]->link) {
+				ShaderOutput *output = mix->inputs[1]->link;
+				vector<ShaderInput*> inputs = mix->outputs[0]->links;
+
+				foreach(ShaderInput *sock, mix->inputs)
+					if(sock->link)
+						disconnect(sock);
+
+				foreach(ShaderInput *input, inputs) {
+					disconnect(input);
+					connect(output, input);
+				}
+			}
+		}
 	}
 }
 

Modified: branches/meshdata_transfer/intern/ghost/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/intern/ghost/CMakeLists.txt	2012-05-25 17:44:37 UTC (rev 47024)
+++ branches/meshdata_transfer/intern/ghost/CMakeLists.txt	2012-05-25 17:52:51 UTC (rev 47025)
@@ -108,10 +108,6 @@
 	)
 endif()
 
-if(WITH_XDG_USER_DIRS)
-	add_definitions(-DWITH_XDG_USER_DIRS)
-endif()
-
 if(WITH_HEADLESS OR WITH_GHOST_SDL)
 	if(WITH_HEADLESS)
 		list(APPEND SRC

Modified: branches/meshdata_transfer/intern/ghost/GHOST_ISystemPaths.h
===================================================================
--- branches/meshdata_transfer/intern/ghost/GHOST_ISystemPaths.h	2012-05-25 17:44:37 UTC (rev 47024)
+++ branches/meshdata_transfer/intern/ghost/GHOST_ISystemPaths.h	2012-05-25 17:52:51 UTC (rev 47025)
@@ -72,17 +72,17 @@
 public:
 	/**
 	 * Determine the base dir in which shared resources are located. It will first try to use
-	 * "unpack and run" path, then look for properly installed path, not including versioning.
+	 * "unpack and run" path, then look for properly installed path, including versioning.
 	 * @return Unsigned char string pointing to system dir (eg /usr/share/blender/).
 	 */
-	virtual const GHOST_TUns8 *getSystemDir() const = 0;
+	virtual const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const = 0;
 
 	/**
-	 * Determine the base dir in which user configuration is stored, not including versioning.
+	 * Determine the base dir in which user configuration is stored, including versioning.
 	 * If needed, it will create the base directory.
 	 * @return Unsigned char string pointing to user dir (eg ~/.blender/).
 	 */
-	virtual const GHOST_TUns8 *getUserDir() const = 0;
+	virtual const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const = 0;
 
 	/**
 	 * Determine the directory of the current binary

Modified: branches/meshdata_transfer/intern/ghost/GHOST_Path-api.h
===================================================================
--- branches/meshdata_transfer/intern/ghost/GHOST_Path-api.h	2012-05-25 17:44:37 UTC (rev 47024)
+++ branches/meshdata_transfer/intern/ghost/GHOST_Path-api.h	2012-05-25 17:52:51 UTC (rev 47025)
@@ -55,16 +55,16 @@
 
 /**
  * Determine the base dir in which shared resources are located. It will first try to use
- * "unpack and run" path, then look for properly installed path, not including versioning.
+ * "unpack and run" path, then look for properly installed path, including versioning.
  * @return Unsigned char string pointing to system dir (eg /usr/share/blender/).
  */
-extern const GHOST_TUns8 *GHOST_getSystemDir(void);
+extern const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr);
 
 /**
- * Determine the base dir in which user configuration is stored, not including versioning.
+ * Determine the base dir in which user configuration is stored, including versioning.
  * @return Unsigned char string pointing to user dir (eg ~).
  */
-extern const GHOST_TUns8 *GHOST_getUserDir(void);
+extern const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr);
 
 
 /**

Modified: branches/meshdata_transfer/intern/ghost/intern/GHOST_Path-api.cpp
===================================================================
--- branches/meshdata_transfer/intern/ghost/intern/GHOST_Path-api.cpp	2012-05-25 17:44:37 UTC (rev 47024)
+++ branches/meshdata_transfer/intern/ghost/intern/GHOST_Path-api.cpp	2012-05-25 17:52:51 UTC (rev 47025)
@@ -45,16 +45,16 @@
 	return GHOST_ISystemPaths::dispose();
 }
 
-const GHOST_TUns8 *GHOST_getSystemDir()
+const GHOST_TUns8 *GHOST_getSystemDir(int version, const char *versionstr)
 {
 	GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
-	return systemPaths ? systemPaths->getSystemDir() : 0;
+	return systemPaths ? systemPaths->getSystemDir(version, versionstr) : 0;
 }
 
-const GHOST_TUns8 *GHOST_getUserDir()
+const GHOST_TUns8 *GHOST_getUserDir(int version, const char *versionstr)
 {
 	GHOST_ISystemPaths *systemPaths = GHOST_ISystemPaths::get();
-	return systemPaths ? systemPaths->getUserDir() : 0; /* shouldn't be NULL */
+	return systemPaths ? systemPaths->getUserDir(version, versionstr) : 0; /* shouldn't be NULL */
 }
 
 const GHOST_TUns8 *GHOST_getBinaryDir()

Modified: branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPaths.h
===================================================================
--- branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPaths.h	2012-05-25 17:44:37 UTC (rev 47024)
+++ branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemPaths.h	2012-05-25 17:52:51 UTC (rev 47025)
@@ -52,17 +52,17 @@
 
 	/**
 	 * Determine the base dir in which shared resources are located. It will first try to use
-	 * "unpack and run" path, then look for properly installed path, not including versioning.
+	 * "unpack and run" path, then look for properly installed path, including versioning.
 	 * @return Unsigned char string pointing to system dir (eg /usr/share/blender/).
 	 */

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list