[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47048] branches/soc-2011-tomato: svn merge ^/trunk/blender -r47003:47047
Campbell Barton
ideasman42 at gmail.com
Sat May 26 16:19:41 CEST 2012
Revision: 47048
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47048
Author: campbellbarton
Date: 2012-05-26 14:19:41 +0000 (Sat, 26 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47003:47047
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47003
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/doc/python_api/rst/bge.render.rst
branches/soc-2011-tomato/intern/ghost/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/GHOST_ISystemPaths.h
branches/soc-2011-tomato/intern/ghost/GHOST_Path-api.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_Path-api.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPaths.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/release/plugins/sequence/color-correction-hsv.c
branches/soc-2011-tomato/release/scripts/startup/bl_operators/anim.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/image_gen.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_color.h
branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenlib/intern/math_color.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.h
branches/soc-2011-tomato/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-tomato/source/blender/editors/include/ED_screen.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_image/SConscript
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_text/space_text.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/util/editmode_undo.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-tomato/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2011-tomato/source/blender/quicktime/quicktime_import.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/gameengine/VideoTexture/VideoFFmpeg.cpp
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/presets/operator/
branches/soc-2011-tomato/release/scripts/presets/operator/wm.collada_export/
Removed Paths:
-------------
branches/soc-2011-tomato/release/scripts/presets/operator/wm.collada_export/
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47003
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-47047
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-05-26 13:59:34 UTC (rev 47047)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-05-26 14:19:41 UTC (rev 47048)
@@ -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/soc-2011-tomato/doc/python_api/rst/bge.render.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/bge.render.rst 2012-05-26 13:59:34 UTC (rev 47047)
+++ branches/soc-2011-tomato/doc/python_api/rst/bge.render.rst 2012-05-26 14:19:41 UTC (rev 47048)
@@ -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/soc-2011-tomato/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/ghost/CMakeLists.txt 2012-05-26 13:59:34 UTC (rev 47047)
+++ branches/soc-2011-tomato/intern/ghost/CMakeLists.txt 2012-05-26 14:19:41 UTC (rev 47048)
@@ -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/soc-2011-tomato/intern/ghost/GHOST_ISystemPaths.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_ISystemPaths.h 2012-05-26 13:59:34 UTC (rev 47047)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_ISystemPaths.h 2012-05-26 14:19:41 UTC (rev 47048)
@@ -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/soc-2011-tomato/intern/ghost/GHOST_Path-api.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_Path-api.h 2012-05-26 13:59:34 UTC (rev 47047)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_Path-api.h 2012-05-26 14:19:41 UTC (rev 47048)
@@ -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/soc-2011-tomato/intern/ghost/intern/GHOST_Path-api.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_Path-api.cpp 2012-05-26 13:59:34 UTC (rev 47047)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_Path-api.cpp 2012-05-26 14:19:41 UTC (rev 47048)
@@ -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/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPaths.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPaths.h 2012-05-26 13:59:34 UTC (rev 47047)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPaths.h 2012-05-26 14:19:41 UTC (rev 47048)
@@ -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/).
*/
- 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.
- * 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;
+ /**
+ * 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(int version, const char *versionstr) const = 0;
/**
* Determine the directory of the current binary
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp 2012-05-26 13:59:34 UTC (rev 47047)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp 2012-05-26 14:19:41 UTC (rev 47048)
@@ -44,21 +44,23 @@
{
}
-const GHOST_TUns8 *GHOST_SystemPathsCarbon::getSystemDir() const
+const GHOST_TUns8 *GHOST_SystemPathsCarbon::getSystemDir(int, const char *versionstr) const
{
- return (GHOST_TUns8 *)"/Library/Application Support";
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list