[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60161] branches/soc-2013-paint: merge trunk -r 60160
Antony Riakiotakis
kalast at gmail.com
Mon Sep 16 13:50:23 CEST 2013
Revision: 60161
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60161
Author: psy-fi
Date: 2013-09-16 11:50:23 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
merge trunk -r 60160
Modified Paths:
--------------
branches/soc-2013-paint/CMakeLists.txt
branches/soc-2013-paint/build_files/scons/config/darwin-config.py
branches/soc-2013-paint/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/pipeline.cc
branches/soc-2013-paint/extern/libmv/libmv-capi_stub.cc
branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
branches/soc-2013-paint/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-paint/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-paint/intern/cycles/kernel/closure/bsdf.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-paint/intern/cycles/kernel/kernel_types.h
branches/soc-2013-paint/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2013-paint/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-paint/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-paint/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2013-paint/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-paint/intern/cycles/render/film.cpp
branches/soc-2013-paint/intern/cycles/render/nodes.cpp
branches/soc-2013-paint/intern/cycles/render/nodes.h
branches/soc-2013-paint/intern/ghost/CMakeLists.txt
branches/soc-2013-paint/intern/ghost/SConscript
branches/soc-2013-paint/intern/ghost/intern/GHOST_NDOFManager.h
branches/soc-2013-paint/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/soc-2013-paint/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2013-paint/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-paint/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2013-paint/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-paint/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-paint/source/blender/blenkernel/BKE_action.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_node.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_paint.h
branches/soc-2013-paint/source/blender/blenkernel/intern/action.c
branches/soc-2013-paint/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-paint/source/blender/blenkernel/intern/curve.c
branches/soc-2013-paint/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-paint/source/blender/blenkernel/intern/node.c
branches/soc-2013-paint/source/blender/blenkernel/intern/object.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-paint/source/blender/compositor/CMakeLists.txt
branches/soc-2013-paint/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2013-paint/source/blender/compositor/intern/COM_ExecutionGroup.h
branches/soc-2013-paint/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2013-paint/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2013-paint/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/soc-2013-paint/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2013-paint/source/blender/compositor/intern/COM_NodeOperation.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_SetColorOperation.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_SetValueOperation.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_SetVectorOperation.h
branches/soc-2013-paint/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2013-paint/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2013-paint/source/blender/editors/animation/keyframing.c
branches/soc-2013-paint/source/blender/editors/armature/pose_edit.c
branches/soc-2013-paint/source/blender/editors/curve/CMakeLists.txt
branches/soc-2013-paint/source/blender/editors/curve/curve_intern.h
branches/soc-2013-paint/source/blender/editors/curve/editcurve.c
branches/soc-2013-paint/source/blender/editors/curve/lorem.c
branches/soc-2013-paint/source/blender/editors/include/ED_armature.h
branches/soc-2013-paint/source/blender/editors/include/ED_mball.h
branches/soc-2013-paint/source/blender/editors/include/ED_object.h
branches/soc-2013-paint/source/blender/editors/include/ED_util.h
branches/soc-2013-paint/source/blender/editors/include/ED_view3d.h
branches/soc-2013-paint/source/blender/editors/include/UI_view2d.h
branches/soc-2013-paint/source/blender/editors/interface/interface.c
branches/soc-2013-paint/source/blender/editors/interface/interface_anim.c
branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-paint/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-paint/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-paint/source/blender/editors/object/object_add.c
branches/soc-2013-paint/source/blender/editors/render/render_internal.c
branches/soc-2013-paint/source/blender/editors/screen/area.c
branches/soc-2013-paint/source/blender/editors/screen/screen_ops.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-paint/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-paint/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-paint/source/blender/editors/space_logic/logic_ops.c
branches/soc-2013-paint/source/blender/editors/space_node/drawnode.c
branches/soc-2013-paint/source/blender/editors/space_node/node_intern.h
branches/soc-2013-paint/source/blender/editors/space_node/node_select.c
branches/soc-2013-paint/source/blender/editors/space_node/node_view.c
branches/soc-2013-paint/source/blender/editors/space_node/space_node.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-paint/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-paint/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-paint/source/blender/editors/util/crazyspace.c
branches/soc-2013-paint/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/soc-2013-paint/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-paint/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_mask_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2013-paint/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2013-paint/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_pose.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2013-paint/source/blender/nodes/CMakeLists.txt
branches/soc-2013-paint/source/blender/nodes/NOD_shader.h
branches/soc-2013-paint/source/blender/nodes/NOD_static_types.h
branches/soc-2013-paint/source/blender/python/intern/bpy_rna.c
branches/soc-2013-paint/source/blender/python/mathutils/mathutils.c
branches/soc-2013-paint/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-paint/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-paint/source/blender/windowmanager/WM_api.h
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-paint/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-paint/source/creator/CMakeLists.txt
branches/soc-2013-paint/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2013-paint/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2013-paint/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2013-paint/source/tests/bl_run_operators.py
branches/soc-2013-paint/source/tools/CTS/FBlender.py
branches/soc-2013-paint/source/tools/CTS/README.txt
Added Paths:
-----------
branches/soc-2013-paint/intern/cycles/kernel/closure/bsdf_hair.h
branches/soc-2013-paint/intern/cycles/kernel/shaders/node_hair_bsdf.osl
branches/soc-2013-paint/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
branches/soc-2013-paint/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h
branches/soc-2013-paint/source/blender/compositor/intern/COM_Debug.cpp
branches/soc-2013-paint/source/blender/compositor/intern/COM_Debug.h
branches/soc-2013-paint/source/blender/editors/curve/editcurve_add.c
branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c
Property Changed:
----------------
branches/soc-2013-paint/
branches/soc-2013-paint/source/blender/editors/interface/interface.c
branches/soc-2013-paint/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-paint
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57386-60080
+ /branches/ge_dev:58091-58422
/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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57386-60160
Modified: branches/soc-2013-paint/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/CMakeLists.txt 2013-09-16 11:40:04 UTC (rev 60160)
+++ branches/soc-2013-paint/CMakeLists.txt 2013-09-16 11:50:23 UTC (rev 60161)
@@ -320,9 +320,22 @@
set(OSX_SYSTEM unsupported)
endif()
message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-
+
+ # workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout
+ # but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>
+ execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
+ string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
+ message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE})
+
if(${CMAKE_GENERATOR} MATCHES "Xcode")
+ if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no bundled developer dir, no sense in getting xcode path from
+ string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension
+ if(${DP_NAME} MATCHES Xcode5)
+ set(XCODE_VERSION 5)
+ endif()
+ endif()
+
##### cmake incompatibility with xcode 4.3 and higher #####
if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
@@ -346,9 +359,10 @@
if(${XCODE_VERSION} VERSION_LESS 4.3)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) # use guaranteed existing sdk
else()
- # note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
- # absolute pathes are more foolproof here !
- set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+ # note: xcode-select path could be ambigous, cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
+ # so i use a selfcomposed bundlepath here
+ set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
+ message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
endif()
Modified: branches/soc-2013-paint/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2013-paint/build_files/scons/config/darwin-config.py 2013-09-16 11:40:04 UTC (rev 60160)
+++ branches/soc-2013-paint/build_files/scons/config/darwin-config.py 2013-09-16 11:50:23 UTC (rev 60161)
@@ -42,6 +42,12 @@
cmd = 'xcodebuild -showsdks'
cmd_sdk=commands.getoutput(cmd)
MACOSX_SDK_CHECK=cmd_sdk
+cmd = 'xcode-select --print-path'
+XCODE_SELECT_PATH=commands.getoutput(cmd)
+if XCODE_SELECT_PATH.endswith("/Contents/Developer"):
+ XCODE_BUNDLE=XCODE_SELECT_PATH[:-19]
+else:
+ XCODE_BUNDLE=XCODE_SELECT_PATH
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
USE_QTKIT=True # Carbon quicktime is not available for 64bit
@@ -99,7 +105,7 @@
LIBDIR = '${LCGDIR}'
if XCODE_CUR_VER >= '4.3': ## since version 4.3, XCode and developer dir are bundled ##
- MACOSX_SDK = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
+ MACOSX_SDK = XCODE_BUNDLE + '/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
#############################################################################
################### Dependency settings ##################
Modified: branches/soc-2013-paint/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
===================================================================
--- branches/soc-2013-paint/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst 2013-09-16 11:40:04 UTC (rev 60160)
+++ branches/soc-2013-paint/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst 2013-09-16 11:50:23 UTC (rev 60161)
@@ -134,6 +134,12 @@
:type: :class:`KX_GameObject` or None
+ .. attribute:: collisionCallbacks
+
+ A list of callables to be run when a collision occurs.
+
+ :type: list
+
.. attribute:: scene
The object's scene. (read-only).
Modified: branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/pipeline.cc
===================================================================
--- branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/pipeline.cc 2013-09-16 11:40:04 UTC (rev 60160)
+++ branches/soc-2013-paint/extern/libmv/libmv/simple_pipeline/pipeline.cc 2013-09-16 11:50:23 UTC (rev 60161)
@@ -124,7 +124,7 @@
} // namespace
-static void CompleteReconstructionLogProress(
+static void CompleteReconstructionLogProgress(
ProgressUpdateCallback *update_callback,
double progress,
const char *step = NULL) {
@@ -176,8 +176,8 @@
LG << "Got " << reconstructed_markers.size()
<< " reconstructed markers for track " << track;
if (reconstructed_markers.size() >= 2) {
- CompleteReconstructionLogProress(update_callback,
- (double)tot_resects/(max_image));
+ CompleteReconstructionLogProgress(update_callback,
+ (double)tot_resects/(max_image));
if (PipelineRoutines::Intersect(reconstructed_markers,
reconstruction)) {
num_intersects++;
@@ -188,9 +188,9 @@
}
}
if (num_intersects) {
- CompleteReconstructionLogProress(update_callback,
- (double)tot_resects/(max_image),
- "Bundling...");
+ CompleteReconstructionLogProgress(update_callback,
+ (double)tot_resects/(max_image),
+ "Bundling...");
PipelineRoutines::Bundle(tracks, reconstruction);
LG << "Ran Bundle() after intersections.";
}
@@ -215,8 +215,8 @@
LG << "Got " << reconstructed_markers.size()
<< " reconstructed markers for image " << image;
if (reconstructed_markers.size() >= 5) {
- CompleteReconstructionLogProress(update_callback,
- (double)tot_resects/(max_image));
+ CompleteReconstructionLogProgress(update_callback,
+ (double)tot_resects/(max_image));
if (PipelineRoutines::Resect(options, reconstructed_markers,
reconstruction, false)) {
num_resects++;
@@ -228,9 +228,9 @@
}
}
if (num_resects) {
- CompleteReconstructionLogProress(update_callback,
- (double)tot_resects/(max_image),
- "Bundling...");
+ CompleteReconstructionLogProgress(update_callback,
+ (double)tot_resects/(max_image),
+ "Bundling...");
PipelineRoutines::Bundle(tracks, reconstruction);
}
LG << "Did " << num_resects << " resects.";
@@ -252,8 +252,8 @@
}
}
if (reconstructed_markers.size() >= 5) {
- CompleteReconstructionLogProress(update_callback,
- (double)tot_resects/(max_image));
+ CompleteReconstructionLogProgress(update_callback,
+ (double)tot_resects/(max_image));
if (PipelineRoutines::Resect(options, reconstructed_markers,
reconstruction, true)) {
num_resects++;
@@ -264,9 +264,9 @@
}
}
if (num_resects) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list