[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59995] branches/soc-2013-dingto: Merged revision(s) 59930-59994 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Tue Sep 10 11:13:29 CEST 2013
Revision: 59995
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59995
Author: dingto
Date: 2013-09-10 09:13:29 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Merged revision(s) 59930-59994 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/CMakeLists.txt
branches/soc-2013-dingto/build_files/scons/config/darwin-config.py
branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
branches/soc-2013-dingto/extern/libmv/libmv-capi.cc
branches/soc-2013-dingto/intern/cycles/kernel/kernel_film.h
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-dingto/intern/mikktspace/mikktspace.c
branches/soc-2013-dingto/intern/opencolorio/fallback_impl.cc
branches/soc-2013-dingto/intern/opencolorio/ocio_capi.cc
branches/soc-2013-dingto/intern/opencolorio/ocio_capi.h
branches/soc-2013-dingto/intern/opencolorio/ocio_impl.cc
branches/soc-2013-dingto/intern/opencolorio/ocio_impl.h
branches/soc-2013-dingto/release/datafiles/colormanagement/config.ocio
branches/soc-2013-dingto/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2013-dingto/release/scripts/presets/keyconfig/3dsmax.py
branches/soc-2013-dingto/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_colortools.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_object.h
branches/soc-2013-dingto/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/curve.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/multires.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_bitmap.h
branches/soc-2013-dingto/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-dingto/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-dingto/source/blender/bmesh/bmesh_class.h
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-dingto/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2013-dingto/source/blender/editors/armature/armature_utils.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_templates.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_bisect.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/object/object_transform.c
branches/soc-2013-dingto/source/blender/editors/space_clip/clip_intern.h
branches/soc-2013-dingto/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-dingto/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_snap.c
branches/soc-2013-dingto/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-dingto/source/blender/imbuf/IMB_imbuf.h
branches/soc-2013-dingto/source/blender/imbuf/intern/IMB_allocimbuf.h
branches/soc-2013-dingto/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-dingto/source/blender/imbuf/intern/IMB_filetype.h
branches/soc-2013-dingto/source/blender/imbuf/intern/IMB_metadata.h
branches/soc-2013-dingto/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2013-dingto/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-dingto/source/blender/imbuf/intern/metadata.c
branches/soc-2013-dingto/source/blender/makesdna/DNA_color_types.h
branches/soc-2013-dingto/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_ui.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_build.c
branches/soc-2013-dingto/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-dingto/source/blender/windowmanager/wm_window.h
Added Paths:
-----------
branches/soc-2013-dingto/release/datafiles/colormanagement/luts/camera_response/
branches/soc-2013-dingto/release/datafiles/colormanagement/luts/film_response/
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_evaluate.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_convexhull2d.h
branches/soc-2013-dingto/source/blender/blenlib/intern/convexhull2d.c
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-59929
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-59994
Modified: branches/soc-2013-dingto/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/CMakeLists.txt 2013-09-10 09:06:24 UTC (rev 59994)
+++ branches/soc-2013-dingto/CMakeLists.txt 2013-09-10 09:13:29 UTC (rev 59995)
@@ -1783,6 +1783,9 @@
set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
endif()
+
+ # Xcode 5 has too low template depth of 128 for libmv
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
endif()
#-----------------------------------------------------------------------------
Modified: branches/soc-2013-dingto/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/config/darwin-config.py 2013-09-10 09:06:24 UTC (rev 59994)
+++ branches/soc-2013-dingto/build_files/scons/config/darwin-config.py 2013-09-10 09:13:29 UTC (rev 59995)
@@ -348,8 +348,9 @@
CFLAGS = []
CXXFLAGS = []
-CCFLAGS = ['-pipe','-funsigned-char']
+CCFLAGS = ['-pipe','-funsigned-char','-ftemplate-depth=1024']
+
CPPFLAGS = list(ARCH_FLAGS)
if WITH_GHOST_COCOA:
Modified: branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
===================================================================
--- branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc 2013-09-10 09:06:24 UTC (rev 59994)
+++ branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc 2013-09-10 09:13:29 UTC (rev 59995)
@@ -288,7 +288,7 @@
}
} // namespace
-void SelectkeyframesBasedOnGRICAndVariance(const Tracks &tracks,
+void SelectKeyframesBasedOnGRICAndVariance(const Tracks &tracks,
CameraIntrinsics &intrinsics,
vector<int> &keyframes) {
// Mirza Tahir Ahmed, Matthew N. Dailey
Modified: branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
===================================================================
--- branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.h 2013-09-10 09:06:24 UTC (rev 59994)
+++ branches/soc-2013-dingto/extern/libmv/libmv/simple_pipeline/keyframe_selection.h 2013-09-10 09:13:29 UTC (rev 59995)
@@ -43,7 +43,7 @@
// \param intrinsics is camera intrinsics
// \param keyframes will contain all images number which are considered
// good to be used for reconstruction
-void SelectkeyframesBasedOnGRICAndVariance(const Tracks &tracks,
+void SelectKeyframesBasedOnGRICAndVariance(const Tracks &tracks,
CameraIntrinsics &intrinsics,
vector<int> &keyframes);
Modified: branches/soc-2013-dingto/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-dingto/extern/libmv/libmv-capi.cc 2013-09-10 09:06:24 UTC (rev 59994)
+++ branches/soc-2013-dingto/extern/libmv/libmv-capi.cc 2013-09-10 09:13:29 UTC (rev 59995)
@@ -510,7 +510,7 @@
libmv::vector<int> keyframes;
/* Get list of all keyframe candidates first. */
- SelectkeyframesBasedOnGRICAndVariance(normalized_tracks,
+ SelectKeyframesBasedOnGRICAndVariance(normalized_tracks,
camera_intrinsics,
keyframes);
Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_film.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_film.h 2013-09-10 09:06:24 UTC (rev 59994)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_film.h 2013-09-10 09:13:29 UTC (rev 59995)
@@ -70,7 +70,7 @@
/* buffer offset */
int index = offset + x + y*stride;
- float4 *in = (__global float4*)(buffer + index*kernel_data.film.pass_stride);
+ float4 *in = (float4*)(buffer + index*kernel_data.film.pass_stride);
half *out = (half*)rgba + index*4;
float scale = kernel_data.film.exposure*sample_scale;
Modified: branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp 2013-09-10 09:06:24 UTC (rev 59994)
+++ branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp 2013-09-10 09:13:29 UTC (rev 59995)
@@ -150,7 +150,11 @@
if (prim) {
ShaderClosure sc;
+#ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
+ sc.weight = weight*TO_FLOAT3(comp->w);
+#else
sc.weight = weight;
+#endif
switch (prim->category()) {
case OSL::ClosurePrimitive::BSDF: {
@@ -327,7 +331,11 @@
OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive *)comp->data();
if (prim && prim->category() == OSL::ClosurePrimitive::Background)
+#ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
+ return TO_FLOAT3(comp->w);
+#else
return make_float3(1.0f, 1.0f, 1.0f);
+#endif
}
else if (closure->type == OSL::ClosureColor::MUL) {
OSL::ClosureMul *mul = (OSL::ClosureMul *)closure;
@@ -379,7 +387,11 @@
if (prim) {
ShaderClosure sc;
+#ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
+ sc.weight = weight*TO_FLOAT3(comp->w);
+#else
sc.weight = weight;
+#endif
switch (prim->category()) {
case OSL::ClosurePrimitive::Volume: {
Modified: branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-10 09:06:24 UTC (rev 59994)
+++ branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-09-10 09:13:29 UTC (rev 59995)
@@ -177,46 +177,12 @@
if (state != GHOST_kWindowStateFullScreen) {
RECT rect;
- MONITORINFO monitor;
- GHOST_TUns32 tw, th;
- width += GetSystemMetrics(SM_CXSIZEFRAME) * 2;
- height += GetSystemMetrics(SM_CYSIZEFRAME) * 2 + GetSystemMetrics(SM_CYCAPTION);
-
rect.left = left;
rect.right = left + width;
rect.top = top;
rect.bottom = top + height;
- monitor.cbSize = sizeof(monitor);
- monitor.dwFlags = 0;
-
- // take taskbar into account
- GetMonitorInfo(MonitorFromRect(&rect, MONITOR_DEFAULTTONEAREST), &monitor);
-
- th = monitor.rcWork.bottom - monitor.rcWork.top;
- tw = monitor.rcWork.right - monitor.rcWork.left;
-
- if (tw < width)
- {
- width = tw;
- left = monitor.rcWork.left;
- }
- else if (monitor.rcWork.right < left + (int)width)
- left = monitor.rcWork.right - width;
- else if (left < monitor.rcWork.left)
- left = monitor.rcWork.left;
-
- if (th < height)
- {
- height = th;
- top = monitor.rcWork.top;
- }
- else if (monitor.rcWork.bottom < top + (int)height)
- top = monitor.rcWork.bottom - height;
- else if (top < monitor.rcWork.top)
- top = monitor.rcWork.top;
-
int wintype = WS_OVERLAPPEDWINDOW;
if (m_parentWindowHwnd != 0)
{
Modified: branches/soc-2013-dingto/intern/mikktspace/mikktspace.c
===================================================================
--- branches/soc-2013-dingto/intern/mikktspace/mikktspace.c 2013-09-10 09:06:24 UTC (rev 59994)
+++ branches/soc-2013-dingto/intern/mikktspace/mikktspace.c 2013-09-10 09:13:29 UTC (rev 59995)
@@ -440,8 +440,8 @@
static NOINLINE int FindGridCell(const float fMin, const float fMax, const float fVal)
{
const float fIndex = g_iCells * ((fVal-fMin)/(fMax-fMin));
- const int iIndex = fIndex<0?0:((int)fIndex);
- return iIndex<g_iCells?iIndex:(g_iCells-1);
+ const int iIndex = (int)fIndex;
+ return iIndex < g_iCells ? (iIndex >= 0 ? iIndex : 0) : (g_iCells - 1);
}
static void MergeVertsFast(int piTriList_in_and_out[], STmpVert pTmpVert[], const SMikkTSpaceContext * pContext, const int iL_in, const int iR_in);
Modified: branches/soc-2013-dingto/intern/opencolorio/fallback_impl.cc
===================================================================
--- branches/soc-2013-dingto/intern/opencolorio/fallback_impl.cc 2013-09-10 09:06:24 UTC (rev 59994)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list