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

Antony Riakiotakis kalast at gmail.com
Thu Sep 12 21:15:45 CEST 2013


Revision: 60081
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60081
Author:   psy-fi
Date:     2013-09-12 19:15:45 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
merge with trunk -r60080

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60080

Modified Paths:
--------------
    branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-paint/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_addon.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_ccg.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_editmesh.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_mask.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_navmesh_conversion.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_ocean.h
    branches/soc-2013-paint/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/addon.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/ocean.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh_intern.h
    branches/soc-2013-paint/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2013-paint/source/blender/blenlib/BLI_array.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_bitmap.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_buffer.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_math_interp.h
    branches/soc-2013-paint/source/blender/blenlib/intern/BLI_array.c
    branches/soc-2013-paint/source/blender/blenlib/intern/buffer.c
    branches/soc-2013-paint/source/blender/blenlib/intern/callbacks.c
    branches/soc-2013-paint/source/blender/blenlib/intern/convexhull2d.c
    branches/soc-2013-paint/source/blender/blenlib/intern/math_interp.c
    branches/soc-2013-paint/source/blender/blenlib/intern/smallhash.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_log.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_log.h
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_wireframe.c
    branches/soc-2013-paint/source/blender/datatoc/datatoc.c
    branches/soc-2013-paint/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2013-paint/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2013-paint/source/blender/editors/render/render_internal.c
    branches/soc-2013-paint/source/blender/editors/space_info/textview.c
    branches/soc-2013-paint/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
    branches/soc-2013-paint/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
    branches/soc-2013-paint/source/blender/imbuf/IMB_colormanagement.h
    branches/soc-2013-paint/source/blender/imbuf/intern/IMB_colormanagement_intern.h
    branches/soc-2013-paint/source/blender/imbuf/intern/IMB_indexer.h
    branches/soc-2013-paint/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2013-paint/source/blender/imbuf/intern/indexer.c
    branches/soc-2013-paint/source/blender/imbuf/intern/indexer_dv.c
    branches/soc-2013-paint/source/blender/makesdna/DNA_freestyle_types.h
    branches/soc-2013-paint/source/blender/makesdna/DNA_linestyle_types.h
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-paint/source/blender/modifiers/intern/MOD_meshcache_util.c
    branches/soc-2013-paint/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2013-paint/source/blender/nodes/NOD_static_types.h
    branches/soc-2013-paint/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2013-paint/source/blender/nodes/intern/node_exec.c
    branches/soc-2013-paint/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2013-paint/source/blender/render/intern/include/texture_ocean.h
    branches/soc-2013-paint/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-paint/source/blender/render/intern/source/texture_ocean.c
    branches/soc-2013-paint/source/blender/windowmanager/intern/wm_playanim.c

Property Changed:
----------------
    branches/soc-2013-paint/


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-60055
   + /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-60080

Modified: branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-09-12 19:10:23 UTC (rev 60080)
+++ branches/soc-2013-paint/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-09-12 19:15:45 UTC (rev 60081)
@@ -176,33 +176,44 @@
 	}
 
 	if (state != GHOST_kWindowStateFullScreen) {
-		RECT rect;
+		RECT rect, desktop;
+		int wintype = WS_OVERLAPPEDWINDOW;
 
-		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 + framex;
-		rect.top = top;
-		rect.bottom = top + height + caption - framey;
-
-		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-paint/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py	2013-09-12 19:10:23 UTC (rev 60080)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py	2013-09-12 19:15:45 UTC (rev 60081)
@@ -2592,19 +2592,6 @@
         subsub.active = scene.unit_settings.system == 'NONE'
         subsub.prop(view, "grid_subdivisions", text="Subdivisions")
 
-        if not scene.render.use_shading_nodes:
-            col = layout.column()
-            col.label(text="Shading:")
-            col.prop(gs, "material_mode", text="")
-            col.prop(view, "show_textured_solid")
-        if view.viewport_shade == 'SOLID':
-            col.prop(view, "use_matcap")
-            if view.use_matcap:
-                col.template_icon_view(view, "matcap_icon")
-        col.prop(view, "show_backface_culling")
-        if obj and obj.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}:
-            col.prop(view, "show_occlude_wire")
-
         layout.separator()
 
         region = view.region_quadview
@@ -2622,6 +2609,39 @@
             row.prop(region, "use_box_clip")
 
 
+class VIEW3D_PT_view3d_shading(Panel):
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'UI'
+    bl_label = "Shading"
+    bl_options = {'DEFAULT_CLOSED'}
+    
+    @classmethod
+    def poll(cls, context):
+        view = context.space_data
+        return (view)
+
+    def draw(self, context):
+        layout = self.layout
+
+        view = context.space_data
+        scene = context.scene
+        gs = scene.game_settings
+        obj = context.object
+
+        col = layout.column()
+
+        if not scene.render.use_shading_nodes:
+            col.prop(gs, "material_mode", text="")
+            col.prop(view, "show_textured_solid")
+        if view.viewport_shade == 'SOLID':
+            col.prop(view, "use_matcap")
+            if view.use_matcap:
+                col.template_icon_view(view, "matcap_icon")
+        col.prop(view, "show_backface_culling")
+        if obj and obj.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}:
+            col.prop(view, "show_occlude_wire")
+
+
 class VIEW3D_PT_view3d_motion_tracking(Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_DerivedMesh.h	2013-09-12 19:10:23 UTC (rev 60080)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_DerivedMesh.h	2013-09-12 19:15:45 UTC (rev 60081)
@@ -28,7 +28,9 @@
 #ifndef __BKE_DERIVEDMESH_H__
 #define __BKE_DERIVEDMESH_H__
 
-/**
+/** \file BKE_DerivedMesh.h
+ *  \ingroup bke
+ *
  * Basic design of the DerivedMesh system:
  *
  * DerivedMesh is a common set of interfaces for mesh systems.

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_addon.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_addon.h	2013-09-12 19:10:23 UTC (rev 60080)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_addon.h	2013-09-12 19:15:45 UTC (rev 60081)
@@ -22,6 +22,10 @@
 #ifndef __BKE_ADDON_H__
 #define __BKE_ADDON_H__
 
+/** \file BKE_addon.h
+ *  \ingroup bke
+ */
+
 #include "RNA_types.h"
 
 typedef struct bAddonPrefType {

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_ccg.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_ccg.h	2013-09-12 19:10:23 UTC (rev 60080)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_ccg.h	2013-09-12 19:15:45 UTC (rev 60081)
@@ -28,6 +28,10 @@
 #ifndef __BKE_CCG_H__
 #define __BKE_CCG_H__
 
+/** \file BKE_ccg.h
+ *  \ingroup bke
+ */
+
 /* defines BLI_INLINE */
 #include "BLI_utildefines.h"
 

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_editmesh.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_editmesh.h	2013-09-12 19:10:23 UTC (rev 60080)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_editmesh.h	2013-09-12 19:15:45 UTC (rev 60081)
@@ -23,6 +23,10 @@
 #ifndef __BKE_EDITMESH_H__
 #define __BKE_EDITMESH_H__
 
+/** \file BKE_editmesh.h
+ *  \ingroup bke
+ */
+
 #include "BKE_customdata.h"
 #include "bmesh.h"
 

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_mask.h	2013-09-12 19:10:23 UTC (rev 60080)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_mask.h	2013-09-12 19:15:45 UTC (rev 60081)
@@ -28,6 +28,10 @@
 #ifndef __BKE_MASK_H__
 #define __BKE_MASK_H__
 
+/** \file BKE_mask.h
+ *  \ingroup bke
+ */
+
 struct ImageUser;
 struct Image;
 struct ListBase;

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_navmesh_conversion.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_navmesh_conversion.h	2013-09-12 19:10:23 UTC (rev 60080)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_navmesh_conversion.h	2013-09-12 19:15:45 UTC (rev 60081)
@@ -28,6 +28,10 @@
 #ifndef __BKE_NAVMESH_CONVERSION_H__

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list