[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60589] branches/vgroup_modifiers: svn merge -r 60562:60588 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Bastien Montagne
montagne29 at wanadoo.fr
Mon Oct 7 15:19:49 CEST 2013
Revision: 60589
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60589
Author: mont29
Date: 2013-10-07 13:19:48 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
svn merge -r 60562:60588 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/vgroup_modifiers/CMakeLists.txt
branches/vgroup_modifiers/build_files/build_environment/install_deps.sh
branches/vgroup_modifiers/intern/cycles/blender/blender_mesh.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_sync.cpp
branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse2.cpp
branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse3.cpp
branches/vgroup_modifiers/intern/cycles/util/util_opengl.h
branches/vgroup_modifiers/intern/cycles/util/util_system.cpp
branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/vgroup_modifiers/release/scripts/modules/bpy/path.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/node.py
branches/vgroup_modifiers/source/blender/blenkernel/intern/bvhutils.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/colortools.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/library.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/shrinkwrap.c
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_geom.h
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_mempool.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_geom.c
branches/vgroup_modifiers/source/blender/blenloader/intern/writefile.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c
branches/vgroup_modifiers/source/blender/editors/space_image/image_draw.c
branches/vgroup_modifiers/source/blender/editors/space_image/image_ops.c
branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene_api.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_window.c
branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
Added Paths:
-----------
branches/vgroup_modifiers/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py
branches/vgroup_modifiers/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py
Removed Paths:
-------------
branches/vgroup_modifiers/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py
branches/vgroup_modifiers/release/scripts/presets/operator/wm.collada_export/open_sim_static.py
Property Changed:
----------------
branches/vgroup_modifiers/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
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,60105
/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
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-60562
+ /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,60105
/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
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-60588
Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt 2013-10-07 12:19:47 UTC (rev 60588)
+++ branches/vgroup_modifiers/CMakeLists.txt 2013-10-07 13:19:48 UTC (rev 60589)
@@ -2285,6 +2285,7 @@
info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT)
info_cfg_option(WITH_MEM_JEMALLOC)
+ info_cfg_option(WITH_MEM_VALGRIND)
info_cfg_option(WITH_SYSTEM_GLEW)
info_cfg_option(WITH_SYSTEM_OPENJPEG)
Modified: branches/vgroup_modifiers/build_files/build_environment/install_deps.sh
===================================================================
--- branches/vgroup_modifiers/build_files/build_environment/install_deps.sh 2013-10-07 12:19:47 UTC (rev 60588)
+++ branches/vgroup_modifiers/build_files/build_environment/install_deps.sh 2013-10-07 13:19:48 UTC (rev 60589)
@@ -3145,7 +3145,7 @@
fi
if $ALL_STATIC; then
- INFO "LLIB = ["xml2", "expat"] + LLIB"
+ INFO "LLIBS = [\""xml2"\", \""expat"\"] + LLIBS"
fi
INFO ""
Modified: branches/vgroup_modifiers/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- branches/vgroup_modifiers/intern/cycles/blender/blender_mesh.cpp 2013-10-07 12:19:47 UTC (rev 60588)
+++ branches/vgroup_modifiers/intern/cycles/blender/blender_mesh.cpp 2013-10-07 13:19:48 UTC (rev 60589)
@@ -480,7 +480,7 @@
BL::Mesh b_mesh = object_to_mesh(b_data, b_ob, b_scene, true, !preview, need_undeformed);
if(b_mesh) {
- if(render_layer.use_surfaces && !(hide_tris && experimental)) {
+ if(render_layer.use_surfaces && !hide_tris) {
if(cmesh.data && experimental && RNA_boolean_get(&cmesh, "use_subdivision"))
create_subd_mesh(mesh, b_mesh, &cmesh, used_shaders);
else
Modified: branches/vgroup_modifiers/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/vgroup_modifiers/intern/cycles/blender/blender_sync.cpp 2013-10-07 12:19:47 UTC (rev 60588)
+++ branches/vgroup_modifiers/intern/cycles/blender/blender_sync.cpp 2013-10-07 13:19:48 UTC (rev 60589)
@@ -34,6 +34,7 @@
#include "util_debug.h"
#include "util_foreach.h"
+#include "util_opengl.h"
CCL_NAMESPACE_BEGIN
@@ -494,7 +495,7 @@
params.shadingsystem = SessionParams::OSL;
/* color managagement */
- params.display_buffer_linear = b_engine.support_display_space_shader(b_scene);
+ params.display_buffer_linear = GLEW_ARB_half_float_pixel && b_engine.support_display_space_shader(b_scene);
return params;
}
Modified: branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse2.cpp
===================================================================
--- branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse2.cpp 2013-10-07 12:19:47 UTC (rev 60588)
+++ branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse2.cpp 2013-10-07 13:19:48 UTC (rev 60589)
@@ -20,7 +20,10 @@
#ifdef WITH_OPTIMIZED_KERNEL
+/* SSE optimization disabled for now on 32 bit, see bug #36316 */
+#if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86)))
#define __KERNEL_SSE2__
+#endif
#include "kernel.h"
#include "kernel_compat_cpu.h"
Modified: branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse3.cpp
===================================================================
--- branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse3.cpp 2013-10-07 12:19:47 UTC (rev 60588)
+++ branches/vgroup_modifiers/intern/cycles/kernel/kernel_sse3.cpp 2013-10-07 13:19:48 UTC (rev 60589)
@@ -20,9 +20,12 @@
#ifdef WITH_OPTIMIZED_KERNEL
+/* SSE optimization disabled for now on 32 bit, see bug #36316 */
+#if !(defined(__GNUC__) && (defined(i386) || defined(_M_IX86)))
#define __KERNEL_SSE2__
#define __KERNEL_SSE3__
#define __KERNEL_SSSE3__
+#endif
#include "kernel.h"
#include "kernel_compat_cpu.h"
Modified: branches/vgroup_modifiers/intern/cycles/util/util_opengl.h
===================================================================
--- branches/vgroup_modifiers/intern/cycles/util/util_opengl.h 2013-10-07 12:19:47 UTC (rev 60588)
+++ branches/vgroup_modifiers/intern/cycles/util/util_opengl.h 2013-10-07 13:19:48 UTC (rev 60589)
@@ -20,12 +20,7 @@
/* OpenGL header includes, used everywhere we use OpenGL, to deal with
* platform differences in one central place. */
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
#include <GL/glew.h>
-#endif
#endif /* __UTIL_OPENGL_H__ */
Modified: branches/vgroup_modifiers/intern/cycles/util/util_system.cpp
===================================================================
--- branches/vgroup_modifiers/intern/cycles/util/util_system.cpp 2013-10-07 12:19:47 UTC (rev 60588)
+++ branches/vgroup_modifiers/intern/cycles/util/util_system.cpp 2013-10-07 13:19:48 UTC (rev 60589)
@@ -116,8 +116,7 @@
return (sizeof(void*)*8);
}
-/* SSE optimization disabled for now on 32 bit, see bug #36316 and #36935 */
-#if defined(__x86_64__) || defined(_M_X64) // ((defined(i386) || defined(_M_IX86))
+#if defined(__x86_64__) || defined(_M_X64) || defined(i386) || defined(_M_IX86)
struct CPUCapabilities {
bool x64;
Modified: branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-10-07 12:19:47 UTC (rev 60588)
+++ branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-10-07 13:19:48 UTC (rev 60589)
@@ -176,44 +176,58 @@
}
if (state != GHOST_kWindowStateFullScreen) {
- RECT rect, desktop;
- int wintype = WS_OVERLAPPEDWINDOW;
+ RECT rect;
+ MONITORINFO monitor;
+ GHOST_TUns32 tw, th;
- if (m_parentWindowHwnd != 0) {
- wintype = WS_CHILD;
- /* check against parent window if given */
- GetWindowRect((HWND)m_parentWindowHwnd, &rect);
- }
- else {
- int framex = GetSystemMetrics(SM_CXSIZEFRAME);
- int framey = GetSystemMetrics(SM_CYSIZEFRAME);
- int caption = GetSystemMetrics(SM_CYCAPTION);
+ width += GetSystemMetrics(SM_CXSIZEFRAME) * 2;
+ height += GetSystemMetrics(SM_CYSIZEFRAME) * 2 + GetSystemMetrics(SM_CYCAPTION);
- /* set up total window rect, taking in account window decorations. */
- rect.left = left - framex;
- rect.right = rect.left + width + framex*2;
- rect.top = top - (caption + framey);
- rect.bottom = rect.top + height + (caption + framey * 2);
- }
+ rect.left = left;
+ rect.right = left + width;
+ rect.top = top;
+ rect.bottom = top + height;
- /* ask how large virtual screen is */
- desktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
- desktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
- desktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN);
- desktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+ monitor.cbSize = sizeof(monitor);
+ monitor.dwFlags = 0;
- /* virtual screen (desktop) bound checks */
- if (rect.left < desktop.left) rect.left = desktop.left;
- if (rect.top < desktop.top) rect.top = desktop.top;
- if (rect.bottom > desktop.bottom) rect.bottom = desktop.bottom;
- if (rect.right > desktop.right) rect.right = desktop.right;
+ // take taskbar into account
+ GetMonitorInfo(MonitorFromRect(&rect, MONITOR_DEFAULTTONEAREST), &monitor);
- /* dimension vars to use in window creation */
- left = rect.left;
- top = rect.top;
- width = rect.right - rect.left;
- height = rect.bottom - rect.top;
+ 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)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list