diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-12 17:28:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-12 17:28:23 +0300 |
| commit | ee73c96e90e87dad9dab8b0bbeb0ceec50d035ad (patch) | |
| tree | 229ad932b20aa17f1995b792a1c8952f684aaad1 /source/blender/windowmanager/intern/wm_window.c | |
| parent | 03305de86d30b138da863a5104274805be4ac430 (diff) | |
- fix for rna show_brush variable shadowing its parent classes with a flag which is now unused.
- getting clipboard RNA variable would crash blender in background mode.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_window.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 438f34f06cf..dc9ccd54832 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -1007,6 +1007,9 @@ char *WM_clipboard_text_get(int selection) { char *p, *p2, *buf, *newbuf; + if(G.background) + return NULL; + buf= (char*)GHOST_getClipboard(selection); if(!buf) return NULL; @@ -1027,6 +1030,9 @@ char *WM_clipboard_text_get(int selection) void WM_clipboard_text_set(char *buf, int selection) { + if(G.background) + return; + #ifdef _WIN32 /* do conversion from \n to \r\n on Windows */ char *p, *p2, *newbuf; |