[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60056] branches/soc-2013-paint: merge with trunk -r 60055

Antony Riakiotakis kalast at gmail.com
Thu Sep 12 01:47:04 CEST 2013


Revision: 60056
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60056
Author:   psy-fi
Date:     2013-09-11 23:47:03 +0000 (Wed, 11 Sep 2013)
Log Message:
-----------
merge with trunk -r 60055

Modified Paths:
--------------
    branches/soc-2013-paint/CMakeLists.txt
    branches/soc-2013-paint/SConstruct
    branches/soc-2013-paint/build_files/scons/config/darwin-config.py
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2013-paint/intern/cycles/render/scene.cpp
    branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2013-paint/intern/ghost/test/gears/GHOST_Test.cpp
    branches/soc-2013-paint/intern/ghost/test/multitest/MultiTest.c
    branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/soc-2013-paint/release/scripts/presets/keyconfig/3dsmax.py
    branches/soc-2013-paint/release/scripts/presets/keyconfig/maya.py
    branches/soc-2013-paint/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2013-paint/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2013-paint/source/blender/blenkernel/BKE_blender.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_mask.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2013-paint/source/blender/blenkernel/intern/blender.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/colortools.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/editmesh_bvh.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/image.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/mask.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/mesh_evaluate.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/scene.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-paint/source/blender/blenlib/BLI_boxpack2d.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_linklist_stack.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2013-paint/source/blender/blenlib/CMakeLists.txt
    branches/soc-2013-paint/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2013-paint/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2013-paint/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2013-paint/source/blender/blenloader/BLO_readfile.h
    branches/soc-2013-paint/source/blender/blenloader/CMakeLists.txt
    branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-paint/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2013-paint/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2013-paint/source/blender/compositor/operations/COM_RenderLayersProg.cpp
    branches/soc-2013-paint/source/blender/compositor/operations/COM_RenderLayersProg.h
    branches/soc-2013-paint/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2013-paint/source/blender/editors/include/UI_interface.h
    branches/soc-2013-paint/source/blender/editors/interface/interface.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-paint/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_templates.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_widgets.c
    branches/soc-2013-paint/source/blender/editors/mesh/editface.c
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_bisect.c
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2013-paint/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2013-paint/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-paint/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2013-paint/source/blender/editors/space_info/textview.c
    branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2013-paint/source/blender/editors/space_text/text_intern.h
    branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-paint/source/blender/editors/transform/transform.c
    branches/soc-2013-paint/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-paint/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-paint/source/blender/editors/transform/transform_snap.c
    branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2013-paint/source/blender/gpu/GPU_extensions.h
    branches/soc-2013-paint/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2013-paint/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2013-paint/source/blender/imbuf/intern/IMB_allocimbuf.h
    branches/soc-2013-paint/source/blender/imbuf/intern/IMB_filetype.h
    branches/soc-2013-paint/source/blender/imbuf/intern/IMB_metadata.h
    branches/soc-2013-paint/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2013-paint/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2013-paint/source/blender/imbuf/intern/metadata.c
    branches/soc-2013-paint/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2013-paint/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2013-paint/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_access.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_action.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_animviz.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_boid.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_color.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_key.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_material.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_object.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_packedfile.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_property.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_rigidbody.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_space.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_text.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2013-paint/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2013-paint/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/soc-2013-paint/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2013-paint/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2013-paint/source/blender/render/intern/source/external_engine.c
    branches/soc-2013-paint/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2013-paint/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2013-paint/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2013-paint/source/blender/windowmanager/wm_window.h
    branches/soc-2013-paint/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2013-paint/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2013-paint/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/soc-2013-paint/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h

Added Paths:
-----------
    branches/soc-2013-paint/source/blender/blenlib/BLI_convexhull2d.h
    branches/soc-2013-paint/source/blender/blenlib/intern/convexhull2d.c
    branches/soc-2013-paint/source/blender/blenloader/intern/versioning_defaults.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-59965
   + /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-60055

Modified: branches/soc-2013-paint/CMakeLists.txt
===================================================================
--- branches/soc-2013-paint/CMakeLists.txt	2013-09-11 23:28:23 UTC (rev 60055)
+++ branches/soc-2013-paint/CMakeLists.txt	2013-09-11 23:47:03 UTC (rev 60056)
@@ -1624,7 +1624,7 @@
 		endif()
 
 	if(WITH_JACK)
-		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework jackmp")
+		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework jackmp")
 	endif()
 
 	else()
@@ -1784,8 +1784,14 @@
 		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")
+	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+		if(${CMAKE_GENERATOR} MATCHES "Xcode")
+			if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
+				# Xcode 5 has too low template depth of 128 for libmv
+				set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
+			endif()
+		endif()
+	endif()
 endif()
 
 #-----------------------------------------------------------------------------

Modified: branches/soc-2013-paint/SConstruct
===================================================================
--- branches/soc-2013-paint/SConstruct	2013-09-11 23:28:23 UTC (rev 60055)
+++ branches/soc-2013-paint/SConstruct	2013-09-11 23:47:03 UTC (rev 60056)
@@ -294,6 +294,9 @@
         print  B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
     else:
         print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
+		
+    if env['CXX'].startswith('clang') and env['XCODE_CUR_VER'] >= '5':
+        env['CCFLAGS'].append('-ftemplate-depth=1024') # only valid for clang bundled with xcode 5
 
     # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
     # necessary header file lives here when installed:
@@ -314,7 +317,7 @@
             print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
             env['WITH_BF_JACK'] = 0
         else:
-            env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+            env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp'])
 
     if env['WITH_BF_CYCLES_OSL'] == 1:
         OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath

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-11 23:28:23 UTC (rev 60055)
+++ branches/soc-2013-paint/build_files/scons/config/darwin-config.py	2013-09-11 23:47:03 UTC (rev 60056)
@@ -348,7 +348,7 @@
 
 CFLAGS = []
 CXXFLAGS = []
-CCFLAGS = ['-pipe','-funsigned-char','-ftemplate-depth=1024']
+CCFLAGS = ['-pipe','-funsigned-char']
 
 
 CPPFLAGS = list(ARCH_FLAGS)

Modified: branches/soc-2013-paint/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/kernel/osl/osl_shader.cpp	2013-09-11 23:28:23 UTC (rev 60055)
+++ branches/soc-2013-paint/intern/cycles/kernel/osl/osl_shader.cpp	2013-09-11 23:47:03 UTC (rev 60056)
@@ -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-paint/intern/cycles/render/scene.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/render/scene.cpp	2013-09-11 23:28:23 UTC (rev 60055)
+++ branches/soc-2013-paint/intern/cycles/render/scene.cpp	2013-09-11 23:47:03 UTC (rev 60056)
@@ -220,7 +220,7 @@
 {
 	if(std == ATTR_STD_UV)
 		return Pass::contains(film->passes, PASS_UV);
-	if(std == ATTR_STD_MOTION_PRE || ATTR_STD_MOTION_POST)
+	if(std == ATTR_STD_MOTION_PRE || std == ATTR_STD_MOTION_POST)
 		return need_motion() == MOTION_PASS;
 	
 	return false;

Modified: branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-09-11 23:28:23 UTC (rev 60055)
+++ branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-09-11 23:47:03 UTC (rev 60056)
@@ -177,46 +177,21 @@
 
 	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);
+		int framex = GetSystemMetrics(SM_CXSIZEFRAME);
+		int framey = GetSystemMetrics(SM_CYSIZEFRAME);
+		int caption = GetSystemMetrics(SM_CYCAPTION);
+		width += framex * 2;
+		height += framey * 2 + caption;
 
+		left -= framex;
+		top -= (caption+framey);
+
 		rect.left = left;
-		rect.right = left + width;
+		rect.right = left + width + framex;
 		rect.top = top;
-		rect.bottom = top + height;
+		rect.bottom = top + height + caption - framey;
 
-		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-paint/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowX11.cpp	2013-09-11 23:28:23 UTC (rev 60055)
+++ branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowX11.cpp	2013-09-11 23:47:03 UTC (rev 60056)
@@ -182,7 +182,6 @@
 	 * X can find us a visual matching those requirements. */
 
 	int attributes[40], i, samples;
-	Atom atoms[2];
 	int natom;
 	int glxVersionMajor, glxVersionMinor; /* As in GLX major.minor */
 
@@ -405,6 +404,7 @@
 
 	/* The basic for a good ICCCM "work" */
 	if (m_system->m_atom.WM_PROTOCOLS) {
+		Atom atoms[2];
 		natom = 0;
 
 		if (m_system->m_atom.WM_DELETE_WINDOW) {

Modified: branches/soc-2013-paint/intern/ghost/test/gears/GHOST_Test.cpp
===================================================================
--- branches/soc-2013-paint/intern/ghost/test/gears/GHOST_Test.cpp	2013-09-11 23:28:23 UTC (rev 60055)
+++ branches/soc-2013-paint/intern/ghost/test/gears/GHOST_Test.cpp	2013-09-11 23:47:03 UTC (rev 60056)
@@ -715,13 +715,16 @@
 
 		// Add the application as event consumer

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list