[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50016] branches/soc-2011-tomato: Merging r49953 through r50015 into from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Sun Aug 19 15:57:56 CEST 2012
Revision: 50016
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50016
Author: nazgul
Date: 2012-08-19 13:57:55 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Merging r49953 through r50015 into from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49953
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50015
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-tomato/intern/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h
branches/soc-2011-tomato/intern/iksolver/CMakeLists.txt
branches/soc-2011-tomato/intern/iksolver/SConscript
branches/soc-2011-tomato/release/scripts/modules/bpy/path.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mball.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/boids.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/font.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/gpencil.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/group.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/idprop.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_listbase.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_rect.h
branches/soc-2011-tomato/source/blender/blenlib/intern/listbase.c
branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
branches/soc-2011-tomato/source/blender/blenlib/intern/voronoi.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_error.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrder.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_deps.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_filter.c
branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/object/object_select.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_edit.c
branches/soc-2011-tomato/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-tomato/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_trackpos.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
Removed Paths:
-------------
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DistanceMatteOperation.h
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-49952
+ /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-50015
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-08-19 13:52:36 UTC (rev 50015)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-08-19 13:57:55 UTC (rev 50016)
@@ -126,6 +126,7 @@
option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON)
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
+option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON)
option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
Modified: branches/soc-2011-tomato/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/config/blender_lite.cmake 2012-08-19 13:52:36 UTC (rev 50015)
+++ branches/soc-2011-tomato/build_files/cmake/config/blender_lite.cmake 2012-08-19 13:57:55 UTC (rev 50016)
@@ -18,6 +18,7 @@
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
set(WITH_COMPOSITOR OFF CACHE FORCE BOOL)
set(WITH_GHOST_XDND OFF CACHE FORCE BOOL)
+set(WITH_IK_SOLVER OFF CACHE FORCE BOOL)
set(WITH_IK_ITASC OFF CACHE FORCE BOOL)
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
set(WITH_IMAGE_DDS OFF CACHE FORCE BOOL)
Modified: branches/soc-2011-tomato/intern/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/CMakeLists.txt 2012-08-19 13:52:36 UTC (rev 50015)
+++ branches/soc-2011-tomato/intern/CMakeLists.txt 2012-08-19 13:57:55 UTC (rev 50016)
@@ -28,7 +28,6 @@
add_subdirectory(guardedalloc)
add_subdirectory(moto)
add_subdirectory(memutil)
-add_subdirectory(iksolver)
add_subdirectory(opennl)
add_subdirectory(mikktspace)
add_subdirectory(raskter)
@@ -58,6 +57,10 @@
add_subdirectory(bsp)
endif()
+if(WITH_IK_SOLVER)
+ add_subdirectory(iksolver)
+endif()
+
if(WITH_IK_ITASC)
add_subdirectory(itasc)
endif()
Modified: branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h 2012-08-19 13:52:36 UTC (rev 50015)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h 2012-08-19 13:57:55 UTC (rev 50016)
@@ -26,7 +26,7 @@
*/
/** \ingroup GHOST
*
- * \file GHOST_C-api.h
+ * \file GHOST_C-api.h
* \brief GHOST C-API function and type declarations.
*/
@@ -43,7 +43,7 @@
* Creates a "handle" for a C++ GHOST object.
* A handle is just an opaque pointer to an empty struct.
* In the API the pointer is casted to the actual C++ class.
- * \param name Name of the handle to create.
+ * \param name Name of the handle to create.
*/
GHOST_DECLARE_HANDLE(GHOST_SystemHandle);
@@ -56,48 +56,47 @@
/**
* Definition of a callback routine that receives events.
- * @param event The event received.
- * @param userdata The callback's user data, supplied to GHOST_CreateSystem.
+ * \param event The event received.
+ * \param userdata The callback's user data, supplied to GHOST_CreateSystem.
*/
typedef int (*GHOST_EventCallbackProcPtr)(GHOST_EventHandle event, GHOST_TUserDataPtr userdata);
/**
* Creates the one and only system.
- * @return a handle to the system.
+ * \return a handle to the system.
*/
extern GHOST_SystemHandle GHOST_CreateSystem(void);
/**
* Disposes the one and only system.
- * @param systemhandle The handle to the system
- * @return An indication of success.
+ * \param systemhandle The handle to the system
+ * \return An indication of success.
*/
extern GHOST_TSuccess GHOST_DisposeSystem(GHOST_SystemHandle systemhandle);
/**
* Creates an event consumer object
- * @param eventCallback The event callback routine.
- * @param userdata Pointer to user data returned to the callback routine.
+ * \param eventCallback The event callback routine.
+ * \param userdata Pointer to user data returned to the callback routine.
*/
extern GHOST_EventConsumerHandle GHOST_CreateEventConsumer(GHOST_EventCallbackProcPtr eventCallback,
GHOST_TUserDataPtr userdata);
/**
* Disposes an event consumer object
- * @param consumerhandle Handle to the event consumer.
- * @return An indication of success.
+ * \param consumerhandle Handle to the event consumer.
+ * \return An indication of success.
*/
extern GHOST_TSuccess GHOST_DisposeEventConsumer(GHOST_EventConsumerHandle consumerhandle);
-
/**
* Returns the system time.
* Returns the number of milliseconds since the start of the system process.
* Based on ANSI clock() routine.
- * @param systemhandle The handle to the system
- * @return The number of milliseconds.
+ * \param systemhandle The handle to the system
+ * \return The number of milliseconds.
*/
extern GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle);
@@ -105,12 +104,12 @@
* Installs a timer.
* Note that, on most operating systems, messages need to be processed in order
* for the timer callbacks to be invoked.
- * @param systemhandle The handle to the system
- * @param delay The time to wait for the first call to the timerProc (in milliseconds)
- * @param interval The interval between calls to the timerProc (in milliseconds)
- * @param timerProc The callback invoked when the interval expires,
- * @param userData Placeholder for user data.
- * @return A timer task (0 if timer task installation failed).
+ * \param systemhandle The handle to the system
+ * \param delay The time to wait for the first call to the timerProc (in milliseconds)
+ * \param interval The interval between calls to the timerProc (in milliseconds)
+ * \param timerProc The callback invoked when the interval expires,
+ * \param userData Placeholder for user data.
+ * \return A timer task (0 if timer task installation failed).
*/
extern GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle,
GHOST_TUns64 delay,
@@ -120,9 +119,9 @@
/**
* Removes a timer.
- * @param systemhandle The handle to the system
- * @param timerTask Timer task to be removed.
- * @return Indication of success.
+ * \param systemhandle The handle to the system
+ * \param timerTask Timer task to be removed.
+ * \return Indication of success.
*/
extern GHOST_TSuccess GHOST_RemoveTimer(GHOST_SystemHandle systemhandle,
GHOST_TimerTaskHandle timertaskhandle);
@@ -133,17 +132,17 @@
/**
* Returns the number of displays on this system.
- * @param systemhandle The handle to the system
- * @return The number of displays.
+ * \param systemhandle The handle to the system
+ * \return The number of displays.
*/
extern GHOST_TUns8 GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle);
/**
* Returns the dimensions of the main display on this system.
- * @param systemhandle The handle to the system
- * @param width A pointer the width gets put in
- * @param height A pointer the height gets put in
- * @return void.
+ * \param systemhandle The handle to the system
+ * \param width A pointer the width gets put in
+ * \param height A pointer the height gets put in
+ * \return void.
*/
extern void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
GHOST_TUns32 *width,
@@ -153,17 +152,17 @@
* Create a new window.
* The new window is added to the list of windows managed.
* Never explicitly delete the window, use disposeWindow() instead.
- * @param systemhandle The handle to the system
- * @param title The name of the window (displayed in the title bar of the window if the OS supports it).
- * @param left The coordinate of the left edge of the window.
- * @param top The coordinate of the top edge of the window.
- * @param width The width the window.
- * @param height The height the window.
- * @param state The state of the window when opened.
- * @param type The type of drawing context installed in this window.
- * @param stereoVisual Stereo visual for quad buffered stereo.
- * @param numOfAASamples Number of samples used for AA (zero if no AA)
- * @return A handle to the new window ( == NULL if creation failed).
+ * \param systemhandle The handle to the system
+ * \param title The name of the window (displayed in the title bar of the window if the OS supports it).
+ * \param left The coordinate of the left edge of the window.
+ * \param top The coordinate of the top edge of the window.
+ * \param width The width the window.
+ * \param height The height the window.
+ * \param state The state of the window when opened.
+ * \param type The type of drawing context installed in this window.
+ * \param stereoVisual Stereo visual for quad buffered stereo.
+ * \param numOfAASamples Number of samples used for AA (zero if no AA)
+ * \return A handle to the new window ( == NULL if creation failed).
*/
extern GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle,
const char *title,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list