diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-12 06:41:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-12 06:41:12 +0300 |
commit | 63018144badeb10c858504c918a3f66047c068b0 (patch) | |
tree | 5982ba549aa3e23a68a412877f51d100ae1bb920 /source/blender/windowmanager | |
parent | 21fc4cabaff9b1caa476af9d700195fb239a07c6 (diff) |
remove redundant assignments & unused vars.
also minor functional changes
- OBJECT_OT_make_links_data() type property is now assigned to the operator property (so popup menu can find it)
- removing BG image now returns cancelled if no image is removed.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 0b88f0f42bf..31cb3172013 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -118,7 +118,7 @@ static void write_history(void); */ static void wm_window_match_init(bContext *C, ListBase *wmlist) { - wmWindowManager *wm= G.main->wm.first; + wmWindowManager *wm; wmWindow *win, *active_win; *wmlist= G.main->wm; diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 3c27a71537b..0398f44a8c9 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -277,7 +277,6 @@ static void wm_gesture_draw_lasso(wmGesture *gt) glColor3ub(96, 96, 96); glLineStipple(1, 0xAAAA); glBegin(GL_LINE_STRIP); - lasso= (short *)gt->customdata; for(i=0; i<gt->points; i++, lasso+=2) glVertex2sv(lasso); if(gt->type==WM_GESTURE_LASSO) |