[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59907] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sat Sep 7 04:34:08 CEST 2013
Revision: 59907
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59907
Author: gdh
Date: 2013-09-07 02:34:06 +0000 (Sat, 07 Sep 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59852 to r59906.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59852
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59906
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/CMakeLists.txt
branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-mac-i386.py
branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-mac-x86_64.py
branches/soc-2013-cycles_mblur/build_files/scons/config/darwin-config.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mask.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/text.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_base.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/bmesh.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/bmesh_class.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-cycles_mblur/source/blender/collada/MeshImporter.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_MemoryBuffer.h
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/armature/pose_slide.c
branches/soc-2013-cycles_mblur/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/physics/physics_pointcache.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_internal.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_opengl.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/Functions0D.h
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/Functions1D.h
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMap.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_enum_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_test.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/WM_api.h
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_mblur/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-cycles_mblur/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2013-cycles_mblur/source/tools/spell_check_source.py
Added Paths:
-----------
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_sort_utils.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/sort_utils.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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:57388-59851
+ /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:57388-59906
Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-09-07 00:52:16 UTC (rev 59906)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-09-07 02:34:06 UTC (rev 59907)
@@ -306,7 +306,9 @@
endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
- if(${MAC_SYS} MATCHES 12)
+ if(${MAC_SYS} MATCHES 13)
+ set(OSX_SYSTEM 10.9)
+ elseif(${MAC_SYS} MATCHES 12)
set(OSX_SYSTEM 10.8)
elseif(${MAC_SYS} MATCHES 11)
set(OSX_SYSTEM 10.7)
Modified: branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-mac-i386.py 2013-09-07 00:52:16 UTC (rev 59906)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-mac-i386.py 2013-09-07 02:34:06 UTC (rev 59907)
@@ -34,6 +34,8 @@
MAC_CUR_VER='10.7'
elif cmd_res[:2]=='12':
MAC_CUR_VER='10.8'
+elif cmd_res[:2]=='13':
+ MAC_CUR_VER='10.9'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
@@ -367,7 +369,7 @@
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
-if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
+if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
LLIBS = ['stdc++']
else:
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-mac-x86_64.py 2013-09-07 00:52:16 UTC (rev 59906)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/config/user-config-mac-x86_64.py 2013-09-07 02:34:06 UTC (rev 59907)
@@ -34,6 +34,8 @@
MAC_CUR_VER='10.7'
elif cmd_res[:2]=='12':
MAC_CUR_VER='10.8'
+elif cmd_res[:2]=='13':
+ MAC_CUR_VER='10.9'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
@@ -367,7 +369,7 @@
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
-if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
+if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
LLIBS = ['stdc++']
else:
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/soc-2013-cycles_mblur/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/scons/config/darwin-config.py 2013-09-07 00:52:16 UTC (rev 59906)
+++ branches/soc-2013-cycles_mblur/build_files/scons/config/darwin-config.py 2013-09-07 02:34:06 UTC (rev 59907)
@@ -34,6 +34,8 @@
MAC_CUR_VER='10.7'
elif cmd_res[:2]=='12':
MAC_CUR_VER='10.8'
+elif cmd_res[:2]=='13':
+ MAC_CUR_VER='10.9'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
@@ -367,7 +369,7 @@
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
-if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
+if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
LLIBS = ['stdc++']
else:
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-09-07 00:52:16 UTC (rev 59906)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-09-07 02:34:06 UTC (rev 59907)
@@ -859,7 +859,6 @@
def draw(self, context):
layout = self.layout
- layout.active = False
world = context.world
panel_node_draw(layout, world, 'OUTPUT_WORLD', 'Volume')
@@ -1005,7 +1004,6 @@
def draw(self, context):
layout = self.layout
- layout.active = False
mat = context.material
cmat = mat.cycles
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp 2013-09-07 00:52:16 UTC (rev 59906)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp 2013-09-07 02:34:06 UTC (rev 59907)
@@ -820,7 +820,7 @@
}
/* add hair geometry to mesh */
- if(primitive == CURVE_TRIANGLES){
+ if(primitive == CURVE_TRIANGLES) {
if(triangle_method == CURVE_CAMERA_TRIANGLES)
ExportCurveTrianglePlanes(mesh, &CData, RotCam);
else {
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h 2013-09-07 00:52:16 UTC (rev 59906)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h 2013-09-07 02:34:06 UTC (rev 59907)
@@ -535,7 +535,7 @@
float tb = 2*(tdif.z - tg.z*(tdifz + gd*(tdifz*gd + or1)));
float tc = dot(tdif,tdif) - tdifz * tdifz * (1 + gd*gd) - or1*or1 - 2*or1*tdifz*gd;
float td = tb*tb - 4*cyla*tc;
- if (td < 0.0f){
+ if (td < 0.0f) {
tree++;
level = tree & -tree;
continue;
Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp 2013-09-07 00:52:16 UTC (rev 59906)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/nodes.cpp 2013-09-07 02:34:06 UTC (rev 59907)
@@ -1872,7 +1872,7 @@
VolumeNode::VolumeNode()
: ShaderNode("volume")
{
- closure = ccl::CLOSURE_VOLUME_ISOTROPIC_ID;
+ closure = CLOSURE_VOLUME_ISOTROPIC_ID;
add_input("Color", SHADER_SOCKET_COLOR, make_float3(0.8f, 0.8f, 0.8f));
add_input("Density", SHADER_SOCKET_FLOAT, 1.0f);
@@ -1930,7 +1930,7 @@
void TransparentVolumeNode::compile(OSLCompiler& compiler)
{
- compiler.add(this, "node_isotropic_volume");
+ compiler.add(this, "node_transparent_volume");
}
/* Isotropic Volume Closure */
Modified: branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemSDL.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemSDL.cpp 2013-09-07 00:52:16 UTC (rev 59906)
+++ branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_SystemSDL.cpp 2013-09-07 02:34:06 UTC (rev 59907)
@@ -276,6 +276,18 @@
}
#undef GXMAP
+/**
+ * Events don't always have valid windows,
+ * but GHOST needs a window _always_. fallback to the GL window.
+ */
+static SDL_Window *SDL_GetWindowFromID_fallback(Uint32 id)
+{
+ SDL_Window *sdl_win = SDL_GetWindowFromID(id);
+ if (sdl_win == NULL) {
+ sdl_win = SDL_GL_GetCurrentWindow();
+ }
+ return sdl_win;
+}
void
GHOST_SystemSDL::processEvent(SDL_Event *sdl_event)
@@ -286,7 +298,7 @@
case SDL_WINDOWEVENT:
{
SDL_WindowEvent &sdl_sub_evt = sdl_event->window;
- GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID));
+ GHOST_WindowSDL *window = findGhostWindow(SDL_GetWindowFromID_fallback(sdl_sub_evt.windowID));
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list