Revision: 48470
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48470
Author: campbellbarton
Date: 2012-07-01 15:39:02 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48415:48469
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48415
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h
branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h
branches/soc-2011-tomato/intern/ghost/GHOST_IWindow.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventManager.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_ISystem.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_ModifierKeys.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPaths.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_TimerManager.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowManager.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-tomato/intern/ghost/test/gears/GHOST_C-Test.c
branches/soc-2011-tomato/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2011-tomato/intern/string/STR_String.h
branches/soc-2011-tomato/intern/string/intern/STR_String.cpp
branches/soc-2011-tomato/intern/utfconv/utf_winfunc.c
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-tomato/release/scripts/templates/operator_file_export.py
branches/soc-2011-tomato/release/scripts/templates/operator_file_import.py
branches/soc-2011-tomato/release/scripts/templates/operator_mesh_add.py
branches/soc-2011-tomato/release/scripts/templates/operator_modal.py
branches/soc-2011-tomato/release/scripts/templates/operator_modal_draw.py
branches/soc-2011-tomato/release/scripts/templates/operator_modal_timer.py
branches/soc-2011-tomato/release/scripts/templates/operator_modal_view3d.py
branches/soc-2011-tomato/release/scripts/templates/operator_node.py
branches/soc-2011-tomato/release/scripts/templates/operator_simple.py
branches/soc-2011-tomato/release/scripts/templates/operator_uv.py
branches/soc-2011-tomato/source/SConscript
branches/soc-2011-tomato/source/blender/CMakeLists.txt
branches/soc-2011-tomato/source/blender/SConscript
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/blenlib/intern/threads.c
branches/soc-2011-tomato/source/blender/blenlib/intern/time.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_250.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_edgesplit.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_slide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2011-tomato/source/blender/compositor/COM_compositor.h
branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingClipOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingDespillOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.h
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.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/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-tomato/source/blender/gpu/CMakeLists.txt
branches/soc-2011-tomato/source/blender/gpu/GPU_draw.h
branches/soc-2011-tomato/source/blender/gpu/SConscript
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/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-tomato/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2011-tomato/source/blender/nodes/CMakeLists.txt
branches/soc-2011-tomato/source/blender/nodes/SConscript
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.h
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-tomato/source/blender/opencl/CMakeLists.txt
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_api.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Expressions/Value.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Texture.h
branches/soc-2011-tomato/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
Added Paths:
-----------
branches/soc-2011-tomato/release/scripts/templates/operator_modal_view3d_raycast.py
Removed Paths:
-------------
branches/soc-2011-tomato/source/creator/SConscript
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-48415
+
/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-48469
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-07-01 15:26:25 UTC (rev
48469)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-07-01 15:39:02 UTC (rev
48470)
@@ -131,6 +131,7 @@
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
option(WITH_OPENCOLORIO "Enable OpenColorIO color management" ON)
+option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
# GHOST Windowing Library Options
option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
@@ -667,7 +668,6 @@
if(NOT OPENIMAGEIO_FOUND)
set(WITH_OPENIMAGEIO OFF)
- set(WITH_CYCLES OFF)
message(STATUS "OpenImageIO not found, disabling
WITH_CYCLES")
endif()
endif()
@@ -1012,8 +1012,8 @@
set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
else()
- set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
- set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
+ set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
+ set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")
endif()
set(BOOST_LIBRARIES
optimized libboost_date_time-${BOOST_POSTFIX}
optimized libboost_filesystem-${BOOST_POSTFIX}
@@ -1500,6 +1500,16 @@
endif()
endif()
+if(WITH_CYCLES)
+ if(NOT WITH_OPENIMAGEIO)
+ message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the
library may not have been found. Configure OIIO or disable WITH_CYCLES")
+ endif()
+ if(NOT WITH_BOOST)
+ message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may
not have been found. Configure BOOST or disable WITH_CYCLES")
+ endif()
+endif()
+
+
# See TEST_SSE_SUPPORT() for how this is defined.
if(WITH_RAYOPTIMIZATION)
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
2012-07-01 15:26:25 UTC (rev 48469)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
2012-07-01 15:39:02 UTC (rev 48470)
@@ -165,7 +165,7 @@
WITH_BF_BOOST = True
BF_BOOST = '${LIBDIR}/boost'
BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47
libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47
libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49
libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49
libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#CUDA
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
2012-07-01 15:26:25 UTC (rev 48469)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
2012-07-01 15:39:02 UTC (rev 48470)
@@ -163,7 +163,7 @@
WITH_BF_BOOST = True
BF_BOOST = '${LIBDIR}/boost'
BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_47
libboost_filesystem-vc90-mt-s-1_47 libboost_regex-vc90-mt-s-1_47
libboost_system-vc90-mt-s-1_47 libboost_thread-vc90-mt-s-1_47'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49
libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49
libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
#CUDA
Modified: branches/soc-2011-tomato/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-07-01
15:26:25 UTC (rev 48469)
+++ branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-07-01
15:39:02 UTC (rev 48470)
@@ -108,6 +108,7 @@
'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
'WITH_BF_FRAMESERVER',
+ 'WITH_BF_COMPOSITOR',
'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB',
'BF_JPEG_LIBPATH',
'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC',
'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC',
'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
@@ -532,6 +533,8 @@
(BoolVariable('WITH_BF_CARVE', 'Enable carve library for mesh boolean
operations', True)),
(BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion
library', True)),
+
+ (BoolVariable('WITH_BF_COMPOSITOR', 'Enable the tile based nodal
compositor', True)),
('BF_X264_CONFIG', 'configuration flags for x264', ''),
('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
Modified: branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h 2012-07-01 15:26:25 UTC
(rev 48469)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h 2012-07-01 15:39:02 UTC
(rev 48470)
@@ -128,8 +128,8 @@
GHOST_TimerTaskHandle timertaskhandle);
/***************************************************************************************
-** Display/window management functionality
-***************************************************************************************/
+ * Display/window management functionality
+
***************************************************************************************/
/**
* Returns the number of displays on this system.
@@ -235,8 +235,8 @@
extern int GHOST_GetFullScreen(GHOST_SystemHandle systemhandle);
/***************************************************************************************
-** Event management functionality
-***************************************************************************************/
+ * Event management functionality
+
***************************************************************************************/
/**
* Retrieves events from the system and stores them in the queue.
@@ -273,8 +273,8 @@
GHOST_EventConsumerHandle
consumerhandle);
/***************************************************************************************
-** Progress bar functionality
-***************************************************************************************/
+ * Progress bar functionality
+
***************************************************************************************/
/**
* Sets the progress bar value displayed in the window/application icon
@@ -290,8 +290,8 @@
extern GHOST_TSuccess GHOST_EndProgressBar(GHOST_WindowHandle windowhandle);
/***************************************************************************************
-** Cursor management functionality
-***************************************************************************************/
+ * Cursor management functionality
+
***************************************************************************************/
/**
* Returns the current cursor shape.
@@ -394,8 +394,8 @@
int *bounds);
/***************************************************************************************
-** Access to mouse button and keyboard states.
-***************************************************************************************/
+ * Access to mouse button and keyboard states.
+
***************************************************************************************/
/**
* Returns the state of a modifier key (ouside the message queue).
@@ -421,8 +421,8 @@
/***************************************************************************************
-** Drag'n'drop operations
-***************************************************************************************/
+ * Drag'n'drop operations
+
***************************************************************************************/
/**
* Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
Modified: branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h 2012-07-01
15:26:25 UTC (rev 48469)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h 2012-07-01
15:39:02 UTC (rev 48470)
@@ -177,8 +177,8 @@
public:
/***************************************************************************************
- ** Time(r) functionality
-
***************************************************************************************/
+ * Time(r) functionality
+
***************************************************************************************/
/**
* Returns the system time.
@@ -211,8 +211,8 @@
virtual GHOST_TSuccess removeTimer(GHOST_ITimerTask *timerTask) = 0;
/***************************************************************************************
- ** Display/window management functionality
-
***************************************************************************************/
+ * Display/window management functionality
+
***************************************************************************************/
/**
* Returns the number of displays on this system.
@@ -296,8 +296,8 @@
virtual bool getFullScreen(void) = 0;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
