[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60078] branches/soc-2013-dingto: Merged revision(s) 60000-60077 from trunk/blender into soc-2013-dingto.

Thomas Dinges blender at dingto.org
Thu Sep 12 17:30:37 CEST 2013 

Revision: 60078
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60078
Author:   dingto
Date:     2013-09-12 15:30:37 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
Merged revision(s) 60000-60077 from trunk/blender into soc-2013-dingto.

Modified Paths:
--------------
    branches/soc-2013-dingto/CMakeLists.txt
    branches/soc-2013-dingto/SConstruct
    branches/soc-2013-dingto/build_files/scons/config/darwin-config.py
    branches/soc-2013-dingto/intern/cycles/render/scene.cpp
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2013-dingto/intern/ghost/test/gears/GHOST_Test.cpp
    branches/soc-2013-dingto/intern/ghost/test/multitest/MultiTest.c
    branches/soc-2013-dingto/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2013-dingto/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_clip.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_addon.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_blender.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_ccg.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_editmesh.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_mask.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_navmesh_conversion.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_ocean.h
    branches/soc-2013-dingto/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/addon.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/blender.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/colortools.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/customdata.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/image.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/mask.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_evaluate.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/ocean.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh_intern.h
    branches/soc-2013-dingto/source/blender/blenkernel/intern/scene.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-dingto/source/blender/blenlib/BLI_array.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_bitmap.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_boxpack2d.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_buffer.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_convexhull2d.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_linklist_stack.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_math_interp.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2013-dingto/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_array.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/buffer.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/callbacks.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/convexhull2d.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/math_interp.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2013-dingto/source/blender/blenlib/intern/smallhash.c
    branches/soc-2013-dingto/source/blender/blenloader/BLO_readfile.h
    branches/soc-2013-dingto/source/blender/blenloader/CMakeLists.txt
    branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-dingto/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_log.c
    branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_log.h
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_wireframe.c
    branches/soc-2013-dingto/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2013-dingto/source/blender/compositor/operations/COM_RenderLayersProg.cpp
    branches/soc-2013-dingto/source/blender/compositor/operations/COM_RenderLayersProg.h
    branches/soc-2013-dingto/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2013-dingto/source/blender/datatoc/datatoc.c
    branches/soc-2013-dingto/source/blender/editors/include/UI_interface.h
    branches/soc-2013-dingto/source/blender/editors/interface/interface.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-dingto/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface_templates.c
    branches/soc-2013-dingto/source/blender/editors/interface/interface_widgets.c
    branches/soc-2013-dingto/source/blender/editors/mesh/editface.c
    branches/soc-2013-dingto/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2013-dingto/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2013-dingto/source/blender/editors/render/render_internal.c
    branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2013-dingto/source/blender/editors/space_clip/clip_ops.c
    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_info/textview.c
    branches/soc-2013-dingto/source/blender/editors/space_text/text_intern.h
    branches/soc-2013-dingto/source/blender/editors/transform/transform.c
    branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-dingto/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
    branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
    branches/soc-2013-dingto/source/blender/gpu/GPU_extensions.h
    branches/soc-2013-dingto/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2013-dingto/source/blender/imbuf/IMB_colormanagement.h
    branches/soc-2013-dingto/source/blender/imbuf/intern/IMB_colormanagement_intern.h
    branches/soc-2013-dingto/source/blender/imbuf/intern/IMB_indexer.h
    branches/soc-2013-dingto/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2013-dingto/source/blender/imbuf/intern/indexer.c
    branches/soc-2013-dingto/source/blender/imbuf/intern/indexer_dv.c
    branches/soc-2013-dingto/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2013-dingto/source/blender/makesdna/DNA_freestyle_types.h
    branches/soc-2013-dingto/source/blender/makesdna/DNA_linestyle_types.h
    branches/soc-2013-dingto/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_access.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_action.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_animviz.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_boid.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_color.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_key.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_material.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_object.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_packedfile.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_property.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_rigidbody.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_text.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2013-dingto/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_meshcache_util.c
    branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2013-dingto/source/blender/nodes/NOD_static_types.h
    branches/soc-2013-dingto/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2013-dingto/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2013-dingto/source/blender/nodes/intern/node_exec.c
    branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2013-dingto/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2013-dingto/source/blender/render/intern/include/texture_ocean.h
    branches/soc-2013-dingto/source/blender/render/intern/source/external_engine.c
    branches/soc-2013-dingto/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-dingto/source/blender/render/intern/source/texture_ocean.c
    branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_playanim.c
    branches/soc-2013-dingto/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h

Added Paths:
-----------
    branches/soc-2013-dingto/source/blender/blenloader/intern/versioning_defaults.c

Property Changed:
----------------
    branches/soc-2013-dingto/
    branches/soc-2013-dingto/source/blender/editors/interface/interface.c


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-59999
   + /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-60077

Modified: branches/soc-2013-dingto/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/CMakeLists.txt	2013-09-12 15:23:09 UTC (rev 60077)
+++ branches/soc-2013-dingto/CMakeLists.txt	2013-09-12 15:30:37 UTC (rev 60078)
@@ -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-dingto/SConstruct
===================================================================
--- branches/soc-2013-dingto/SConstruct	2013-09-12 15:23:09 UTC (rev 60077)
+++ branches/soc-2013-dingto/SConstruct	2013-09-12 15:30:37 UTC (rev 60078)
@@ -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-dingto/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2013-dingto/build_files/scons/config/darwin-config.py	2013-09-12 15:23:09 UTC (rev 60077)
+++ branches/soc-2013-dingto/build_files/scons/config/darwin-config.py	2013-09-12 15:30:37 UTC (rev 60078)
@@ -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-dingto/intern/cycles/render/scene.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/scene.cpp	2013-09-12 15:23:09 UTC (rev 60077)
+++ branches/soc-2013-dingto/intern/cycles/render/scene.cpp	2013-09-12 15:30:37 UTC (rev 60078)
@@ -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-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-09-12 15:23:09 UTC (rev 60077)
+++ branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-09-12 15:30:37 UTC (rev 60078)
@@ -176,24 +176,44 @@
 	}
 
 	if (state != GHOST_kWindowStateFullScreen) {
-		RECT rect;
+		RECT rect, desktop;
+		int wintype = WS_OVERLAPPEDWINDOW;
 
-		rect.left = left;
-		rect.right = left + width;
-		rect.top = top;
-		rect.bottom = top + height;
-
-		int wintype = WS_OVERLAPPEDWINDOW;
 		if (m_parentWindowHwnd != 0)
 		{
 			wintype = WS_CHILD;
+			/* check against parent window if given */
 			GetWindowRect((HWND)m_parentWindowHwnd, &rect);
-			left = 0;
-			top = 0;
-			width = rect.right - rect.left;
-			height = rect.bottom - rect.top;
+		} else {
+			int framex = GetSystemMetrics(SM_CXSIZEFRAME);
+			int framey = GetSystemMetrics(SM_CYSIZEFRAME);
+			int caption = 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);
 		}
-		
+
+		/* 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);
+
+		/* 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;
+
+		/* dimension vars to use in window creation */
+		left = rect.left;
+		top = rect.top;
+		width = rect.right - rect.left;
+		height = rect.bottom - rect.top;
+
 		wchar_t *title_16 = alloc_utf16_from_8((char *)(const char *)title, 0);
 		m_hWnd = ::CreateWindowW(
 		    s_windowClassName,          // pointer to registered class name

Modified: branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowX11.cpp	2013-09-12 15:23:09 UTC (rev 60077)
+++ branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowX11.cpp	2013-09-12 15:30:37 UTC (rev 60078)
@@ -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-dingto/intern/ghost/test/gears/GHOST_Test.cpp
===================================================================
--- branches/soc-2013-dingto/intern/ghost/test/gears/GHOST_Test.cpp	2013-09-12 15:23:09 UTC (rev 60077)
+++ branches/soc-2013-dingto/intern/ghost/test/gears/GHOST_Test.cpp	2013-09-12 15:30:37 UTC (rev 60078)
@@ -715,13 +715,16 @@
 
 		// Add the application as event consumer
 		fSystem->addEventConsumer(&app);
-                
+
 		// Enter main loop
 		while (!app.m_exitRequested) {
 			//printf("main: loop\n");
 			fSystem->processEvents(true);
 			fSystem->dispatchEvents();
 		}
+
+		// Remove so ghost doesn't do a double free
+		fSystem->removeEventConsumer(&app);
 	}
 
 	// Dispose the system

Modified: branches/soc-2013-dingto/intern/ghost/test/multitest/MultiTest.c
===================================================================
--- branches/soc-2013-dingto/intern/ghost/test/multitest/MultiTest.c	2013-09-12 15:23:09 UTC (rev 60077)
+++ branches/soc-2013-dingto/intern/ghost/test/multitest/MultiTest.c	2013-09-12 15:30:37 UTC (rev 60078)
@@ -931,11 +931,13 @@
 	
 int main(int argc, char **argv)
 {
+	MultiTestApp *app;
+
 #ifndef USE_BMF
 	BLF_init(11, 72);
 #endif
 
-	MultiTestApp *app = multitestapp_new();
+	app = multitestapp_new();
 	
 	multitestapp_run(app);
 	multitestapp_free(app);

Modified: branches/soc-2013-dingto/release/scripts/startup/bl_operators/uvcalc_lightmap.py
===================================================================

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list