[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53212] branches/soc-2011-tomato: Merging r53203 through r53211 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Thu Dec 20 17:46:51 CET 2012


Revision: 53212
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53212
Author:   nazgul
Date:     2012-12-20 16:46:50 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
Merging r53203 through r53211 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-tomato/release/datafiles/blender_icons.svg
    branches/soc-2011-tomato/release/datafiles/blender_icons16.png
    branches/soc-2011-tomato/release/datafiles/blender_icons32.png
    branches/soc-2011-tomato/release/scripts/templates/operator_modal_draw.py
    branches/soc-2011-tomato/source/blender/blenkernel/intern/bpath.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/dds/FlipDXT.cpp
    branches/soc-2011-tomato/source/blender/python/intern/bpy.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.h
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_callback.h
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-53202
   + /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-53211

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.h	2012-12-20 16:37:07 UTC (rev 53211)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.h	2012-12-20 16:46:50 UTC (rev 53212)
@@ -296,8 +296,6 @@
 	/** Multitouch trackpad availability */
 	bool m_hasMultiTouchTrackpad;
 	
-	/** Multitouch gesture in progress, useful to distinguish trackpad from mouse scroll events */
-	bool m_isGestureInProgress;
 };
 
 #endif // __GHOST_SYSTEMCOCOA_H__

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-12-20 16:37:07 UTC (rev 53211)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-12-20 16:46:50 UTC (rev 53212)
@@ -551,7 +551,6 @@
 	char *rstring = NULL;
 	
 	m_modifierMask =0;
-	m_isGestureInProgress = false;
 	m_cursorDelta_x=0;
 	m_cursorDelta_y=0;
 	m_outsideLoopEventProcessed = false;
@@ -1580,8 +1579,7 @@
 			
 		case NSScrollWheel:
 			{
-				/* Send trackpad event if inside a trackpad gesture, send wheel event otherwise */
-				if (!m_hasMultiTouchTrackpad || !m_isGestureInProgress) {
+				if (!m_hasMultiTouchTrackpad) {
 					GHOST_TInt32 delta;
 					
 					double deltaF = [event deltaY];
@@ -1641,12 +1639,6 @@
 				pushEvent(new GHOST_EventTrackpad([event timestamp] * 1000, window, GHOST_kTrackpadEventRotate, x, y,
 				                                  -[event rotation] * 5.0, 0));
 			}
-		case NSEventTypeBeginGesture:
-			m_isGestureInProgress = true;
-			break;
-		case NSEventTypeEndGesture:
-			m_isGestureInProgress = false;
-			break;
 		default:
 			return GHOST_kFailure;
 			break;

Modified: branches/soc-2011-tomato/release/datafiles/blender_icons.svg
===================================================================
--- branches/soc-2011-tomato/release/datafiles/blender_icons.svg	2012-12-20 16:37:07 UTC (rev 53211)
+++ branches/soc-2011-tomato/release/datafiles/blender_icons.svg	2012-12-20 16:46:50 UTC (rev 53212)
@@ -14,19 +14,222 @@
    height="640"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.2 r9819"
    version="1.0"
-   sodipodi:docname="blender_icons.svg"
+   sodipodi:docname="Blender ICONS - v.2.5.08.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    style="display:inline;enable-background:new"
-   inkscape:export-filename="blender_icons.png"
-   inkscape:export-xdpi="180"
-   inkscape:export-ydpi="180">
+   inkscape:export-filename="/home/wolter/Documenten/Blender/icons/D:\Documents\Blender\icons\BF icons v.2.5.08a.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <title
-     id="title49470">Blender icons v. 2.5.06</title>
+     id="title49470">Blender icons v. 2.5.08</title>
   <defs
      id="defs4">
     <linearGradient
+       inkscape:collect="always"
+       id="linearGradient30139">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop30141" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop30143" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient30131">
+      <stop
+         style="stop-color:#999999;stop-opacity:1;"
+         offset="0"
+         id="stop30133" />
+      <stop
+         style="stop-color:#999999;stop-opacity:0;"
+         offset="1"
+         id="stop30135" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient30122">
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:1;"
+         offset="0"
+         id="stop30124" />
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:0;"
+         offset="1"
+         id="stop30127" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient30390">
+      <stop
+         style="stop-color:#363636;stop-opacity:1;"
+         offset="0"
+         id="stop30392" />
+      <stop
+         style="stop-color:#4f4f4f;stop-opacity:1;"
+         offset="1"
+         id="stop30394" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient29870">
+      <stop
+         id="stop29872"
+         offset="0"
+         style="stop-color:#989898;stop-opacity:1" />
+      <stop
+         id="stop29874"
+         offset="1"
+         style="stop-color:#3d3d3d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient29757">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop29759" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop29761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient16772">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop16774" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop16776" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient16764">
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:1;"
+         offset="0"
+         id="stop16766" />
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:0;"
+         offset="1"
+         id="stop16768" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16723">
+      <stop
+         style="stop-color:#343434;stop-opacity:0.61960787;"
+         offset="0"
+         id="stop16725" />
+      <stop
+         style="stop-color:#3d3d3d;stop-opacity:1;"
+         offset="1"
+         id="stop16727" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient107519">
+      <stop
+         style="stop-color:#f8c5bd;stop-opacity:1"
+         offset="0"
+         id="stop107521" />
+      <stop
+         style="stop-color:#a42f0e;stop-opacity:1"
+         offset="1"
+         id="stop107523" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient107148">
+      <stop
+         id="stop107150"
+         offset="0"
+         style="stop-color:#ee7b68;stop-opacity:1" />
+      <stop
+         id="stop107152"
+         offset="1"
+         style="stop-color:#a42f0e;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient107142">
+      <stop
+         id="stop107144"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop107146"
+         offset="1"
+         style="stop-color:#f18d73;stop-opacity:0.2079646" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient106427">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop106429" />
+      <stop
+         style="stop-color:#030303;stop-opacity:1"
+         offset="1"
+         id="stop106431" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16504">
+      <stop
+         id="stop16506"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop16508"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient17602">
+      <stop
+         id="stop17604"
+         offset="0"
+         style="stop-color:#592e00;stop-opacity:1" />
+      <stop
+         id="stop17606"
+         offset="1"
+         style="stop-color:#9e5200;stop-opacity:0.57431373" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient17596">
+      <stop
+         style="stop-color:#ee7b00;stop-opacity:1"
+         offset="0"
+         id="stop17598" />
+      <stop
+         style="stop-color:#ffc280;stop-opacity:1"
+         offset="1"
+         id="stop17600" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient17438">
+      <stop
+         style="stop-color:#ff9f37;stop-opacity:1"
+         offset="0"
+         id="stop17440" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop17442" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient17430">
+      <stop
+         style="stop-color:#ff9f37;stop-opacity:1"
+         offset="0"
+         id="stop17432" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop17434" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient30958">
       <stop
          id="stop30960"
@@ -332,24 +535,6 @@
          id="stop28891" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1610"
-       id="linearGradient44421"
-       gradientUnits="userSpaceOnUse"
-       x1="209"
-       y1="238"
-       x2="226.625"
-       y2="251.71078" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1610"
-       id="linearGradient44557"
-       gradientUnits="userSpaceOnUse"
-       x1="209"
-       y1="238"
-       x2="226.625"
-       y2="251.71078" />
-    <linearGradient
        id="linearGradient24168">
       <stop
          id="stop24170"
@@ -421,6 +606,18 @@
          style="stop-color:#ffedd5;stop-opacity:1;" />
     </linearGradient>
     <linearGradient

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list