[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60558] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sat Oct 5 10:41:23 CEST 2013
Revision: 60558
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60558
Author: gdh
Date: 2013-10-05 08:41:23 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
Merged trunk into branch. Includes r60518 to r60557.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60518
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60557
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/CMakeLists.txt
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_mblur/intern/cycles/util/util_system.cpp
branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/lasso.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_iterators.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-cycles_mblur/source/blender/collada/AnimationExporter.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/ArmatureExporter.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/ControllerExporter.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/ExportSettings.h
branches/soc-2013-cycles_mblur/source/blender/collada/collada.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/collada.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_render.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_view3d.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/io/io_collada.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/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/glutil.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_rigidbody.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/wm_subwindow.h
branches/soc-2013-cycles_mblur/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-cycles_mblur/source/creator/creator.c
branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Added Paths:
-----------
branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py
branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/open_sim_static.py
Removed Paths:
-------------
branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/second_life_static.py
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:ignore
- CMakeLists.txt.user
+ BUILD_NOTES.txt
*.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
blender.kdev4
.kdev4
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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-60517
+ /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:57388-60557
Modified: branches/soc-2013-cycles_mblur/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-10-05 04:59:43 UTC (rev 60557)
+++ branches/soc-2013-cycles_mblur/CMakeLists.txt 2013-10-05 08:41:23 UTC (rev 60558)
@@ -278,6 +278,10 @@
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
mark_as_advanced(WITH_MEM_JEMALLOC)
+# currently only used for BLI_mempool
+option(WITH_MEM_VALGRIND "Enable extended valgrind support for better reporting" OFF)
+mark_as_advanced(WITH_MEM_VALGRIND)
+
# Debug
option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
mark_as_advanced(WITH_CXX_GUARDEDALLOC)
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-10-05 04:59:43 UTC (rev 60557)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-10-05 08:41:23 UTC (rev 60558)
@@ -1228,7 +1228,7 @@
scene = context.scene
cscene = scene.cycles
psys = context.particle_system
- return CyclesButtonsPanel.poll(context) and psys
+ return CyclesButtonsPanel.poll(context) and psys and psys.settings.type == 'HAIR'
def draw_header(self, context):
ccscene = context.scene.cycles_curves
@@ -1268,8 +1268,9 @@
scene = context.scene
cscene = scene.cycles
ccscene = scene.cycles_curves
- use_curves = ccscene.use_curves and context.particle_system
- return CyclesButtonsPanel.poll(context) and use_curves
+ psys = context.particle_system
+ use_curves = ccscene.use_curves and psys
+ return CyclesButtonsPanel.poll(context) and use_curves and psys.settings.type == 'HAIR'
def draw(self, context):
layout = self.layout
Modified: branches/soc-2013-cycles_mblur/intern/cycles/util/util_system.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/util/util_system.cpp 2013-10-05 04:59:43 UTC (rev 60557)
+++ branches/soc-2013-cycles_mblur/intern/cycles/util/util_system.cpp 2013-10-05 08:41:23 UTC (rev 60558)
@@ -116,8 +116,8 @@
return (sizeof(void*)*8);
}
-/* SSE optimization disabled for now on 32 bit GCC, see bug #36316 */
-#if defined(__x86_64__) || defined(_M_X64) || ((defined(i386) || defined(_M_IX86)) && !defined(__GNUC__))
+/* 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))
struct CPUCapabilities {
bool x64;
Modified: branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowX11.cpp 2013-10-05 04:59:43 UTC (rev 60557)
+++ branches/soc-2013-cycles_mblur/intern/ghost/intern/GHOST_WindowX11.cpp 2013-10-05 08:41:23 UTC (rev 60558)
@@ -65,6 +65,14 @@
long input_mode;
} MotifWmHints;
+// Workaround for MESA bug #54080
+// https://bugs.freedesktop.org/show_bug.cgi?id=54080()
+#define SWAP_INTERVALS_WORKAROUND
+
+#ifdef SWAP_INTERVALS_WORKAROUND
+static bool g_swap_interval_disabled = false;
+#endif // SWAP_INTERVALS_WORKAROUND
+
#define MWM_HINTS_DECORATIONS (1L << 1)
@@ -1519,18 +1527,67 @@
GHOST_TSuccess
GHOST_WindowX11::
setSwapInterval(int interval) {
- if (!GLX_EXT_swap_control)
+ if (!GLX_EXT_swap_control || !glXSwapIntervalEXT
+#ifdef SWAP_INTERVALS_WORKAROUND
+ || g_swap_interval_disabled
+#endif // SWAP_INTERVALS_WORKAROUND
+ )
+ {
return GHOST_kFailure;
+ }
glXSwapIntervalEXT(m_display, m_window, interval);
return GHOST_kSuccess;
}
+#ifdef SWAP_INTERVALS_WORKAROUND
+static int QueryDrawable_ApplicationErrorHandler(Display *display, XErrorEvent *theEvent)
+{
+ fprintf(stderr, "Ignoring Xlib error: error code %d request code %d\n",
+ theEvent->error_code, theEvent->request_code);
+ if (!g_swap_interval_disabled) {
+ fprintf(stderr, "Disabling SWAP INTERVALS extension\n");
+ g_swap_interval_disabled = true;
+ }
+ return 0;
+}
+
+static int QueryDrawable_ApplicationIOErrorHandler(Display *display)
+{
+ fprintf(stderr, "Ignoring Xlib error: error IO\n");
+ if (!g_swap_interval_disabled) {
+ fprintf(stderr, "Disabling SWAP INTERVALS extension\n");
+ g_swap_interval_disabled = true;
+ }
+ return 0;
+}
+#endif // SWAP_INTERVALS_WORKAROUND
+
int
GHOST_WindowX11::
getSwapInterval() {
if (GLX_EXT_swap_control) {
- unsigned int value;
+#ifdef SWAP_INTERVALS_WORKAROUND
+ /* XXX: Current MESA driver will give GLXBadDrawable for all
+ * the glXQueryDrawable requests with direct contexts.
+ *
+ * To prevent crashes and unexpected behaviors, we will
+ * disable swap intervals extension if query fails here.
+ * (because if we will override interval without having
+ * old value we couldn't restore it properly).
+ */
+ XErrorHandler old_handler = XSetErrorHandler(QueryDrawable_ApplicationErrorHandler);
+ XIOErrorHandler old_handler_io = XSetIOErrorHandler(QueryDrawable_ApplicationIOErrorHandler);
+#endif // SWAP_INTERVALS_WORKAROUND
+
+ unsigned int value = 0;
glXQueryDrawable(m_display, m_window, GLX_SWAP_INTERVAL_EXT, &value);
+
+#ifdef SWAP_INTERVALS_WORKAROUND
+ /* Restore handler */
+ (void) XSetErrorHandler(old_handler);
+ (void) XSetIOErrorHandler(old_handler_io);
+#endif // SWAP_INTERVALS_WORKAROUND
+
return (int)value;
}
return 0;
Copied: branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py (from rev 60557, trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py)
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py (rev 0)
+++ branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/open_sim_rigged.py 2013-10-05 08:41:23 UTC (rev 60558)
@@ -0,0 +1,18 @@
+import bpy
+op = bpy.context.active_operator
+
+op.apply_modifiers = True
+op.export_mesh_type = 0
+op.export_mesh_type_selection = 'view'
+op.selected = True
+op.include_children = False
+op.include_armatures = True
+op.include_shapekeys = False
+op.deform_bones_only = True
+op.active_uv_only = True
+op.include_uv_textures = True
+op.use_texture_copies = True
+op.triangulate = True
+op.use_object_instantiation = False
+op.sort_by_name = True
+op.open_sim = True
Copied: branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/open_sim_static.py (from rev 60557, trunk/blender/release/scripts/presets/operator/wm.collada_export/open_sim_static.py)
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/open_sim_static.py (rev 0)
+++ branches/soc-2013-cycles_mblur/release/scripts/presets/operator/wm.collada_export/open_sim_static.py 2013-10-05 08:41:23 UTC (rev 60558)
@@ -0,0 +1,18 @@
+import bpy
+op = bpy.context.active_operator
+
+op.apply_modifiers = True
+op.export_mesh_type = 0
+op.export_mesh_type_selection = 'view'
+op.selected = True
+op.include_children = False
+op.include_armatures = False
+op.include_shapekeys = False
+op.deform_bones_only = False
+op.active_uv_only = True
+op.include_uv_textures = True
+op.use_texture_copies = True
+op.triangulate = True
+op.use_object_instantiation = False
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list