[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33619] trunk/blender/source/blender/ windowmanager/intern/wm_window.c: clipboard setting background check correction.

Campbell Barton ideasman42 at gmail.com
Sun Dec 12 22:28:07 CET 2010


Revision: 33619
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33619
Author:   campbellbarton
Date:     2010-12-12 22:28:07 +0100 (Sun, 12 Dec 2010)

Log Message:
-----------
clipboard setting background check correction.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_window.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2010-12-12 20:36:07 UTC (rev 33618)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2010-12-12 21:28:07 UTC (rev 33619)
@@ -1030,36 +1030,35 @@
 
 void WM_clipboard_text_set(char *buf, int selection)
 {
+	if(!G.background) {
 #ifdef _WIN32
-	/* do conversion from \n to \r\n on Windows */
-	char *p, *p2, *newbuf;
-	int newlen= 0;
+		/* do conversion from \n to \r\n on Windows */
+		char *p, *p2, *newbuf;
+		int newlen= 0;
+		
+		for(p= buf; *p; p++) {
+			if(*p == '\n')
+				newlen += 2;
+			else
+				newlen++;
+		}
+		
+		newbuf= MEM_callocN(newlen+1, "WM_clipboard_text_set");
 	
-	for(p= buf; *p; p++) {
-		if(*p == '\n')
-			newlen += 2;
-		else
-			newlen++;
-	}
-	
-	newbuf= MEM_callocN(newlen+1, "WM_clipboard_text_set");
-
-	for(p= buf, p2= newbuf; *p; p++, p2++) {
-		if(*p == '\n') { 
-			*(p2++)= '\r'; *p2= '\n';
+		for(p= buf, p2= newbuf; *p; p++, p2++) {
+			if(*p == '\n') { 
+				*(p2++)= '\r'; *p2= '\n';
+			}
+			else *p2= *p;
 		}
-		else *p2= *p;
-	}
-	*p2= '\0';
-
-	GHOST_putClipboard((GHOST_TInt8*)newbuf, selection);
-	MEM_freeN(newbuf);
+		*p2= '\0';
+	
+		GHOST_putClipboard((GHOST_TInt8*)newbuf, selection);
+		MEM_freeN(newbuf);
 #else
-	GHOST_putClipboard((GHOST_TInt8*)buf, selection);
+		GHOST_putClipboard((GHOST_TInt8*)buf, selection);
 #endif
-
-	if(G.background)
-		return;
+	}
 }
 
 /* ******************* progress bar **************** */





More information about the Bf-blender-cvs mailing list