diff options
author | Ton Roosendaal <ton@blender.org> | 2009-01-22 18:46:35 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-01-22 18:46:35 +0300 |
commit | d5f69e85522fceb4847938ac815fcefe3959727b (patch) | |
tree | 83795bc64a2aa9242f1d4edf38e72e97b3307a5f /source/blender/windowmanager | |
parent | 9cc59fb0c329bb788defe9c56b69d0919caaba96 (diff) |
2.5
- warning cleanup (wrong casts, unused vars, missing protos)
- removed old cruft from node_edit.c
- cleaned wm_jobs.c a bit
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 1 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 13104b58a04..9584751a775 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -180,7 +180,6 @@ void WM_jobs_customdata(struct wmJob *, void *customdata, void (*free)(void *)) void WM_jobs_timer(struct wmJob *, double timestep, unsigned int note); void WM_jobs_callbacks(struct wmJob *, void (*startjob)(void *, short *, short *), - void (*listener)(struct wmJob *, struct wmNotifier *), void (*update)(void *)); void WM_jobs_start(struct wmJob *); diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 67b114b746f..8537c745303 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -338,7 +338,7 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win) else { GLint format; - glGenTextures(1, &win->drawtex); + glGenTextures(1, (GLuint *)&win->drawtex); if(!win->drawtex) { /* not the typical failure case but we handle it anyway */ @@ -363,7 +363,7 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win) if(format != GL_RGB8) { /* proxy texture is only guaranteed to test for the cases that * there is only one texture in use, which may not be the case */ - glDeleteTextures(1, &win->drawtex); + glDeleteTextures(1, (GLuint *)&win->drawtex); win->drawmethod= USER_DRAW_OVERLAP_ALL; wm_method_draw_overlap_all(C, win); @@ -380,7 +380,7 @@ static void wm_method_draw_triple(bContext *C, wmWindow *win) if(glGetError() == GL_OUT_OF_MEMORY) { /* not sure if this works everywhere .. */ - glDeleteTextures(1, &win->drawtex); + glDeleteTextures(1, (GLuint *)&win->drawtex); win->drawmethod= USER_DRAW_OVERLAP_ALL; wm_method_draw_overlap_all(C, win); diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 1f320df7587..422cc42e10b 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -85,7 +85,7 @@ struct wmJob { /* job originating from, keep track of this when deleting windows */ wmWindow *win; - /* should store entire own context, for start, free or listeners */ + /* should store entire own context, for start, update, free */ void *customdata; void (*startjob)(void *, short *stop, short *do_update); void (*free)(void *); @@ -96,9 +96,6 @@ struct wmJob { /* the notifier event timers should send */ unsigned int note; - /* managing */ - void (*listener)(struct wmJob *, struct wmNotifier *); - /* update gets called if thread defines so, and max once per timerstep */ /* no drawing, send notifiers! */ void (*update)(void *); @@ -161,11 +158,9 @@ void WM_jobs_timer(wmJob *steve, double timestep, unsigned int note) void WM_jobs_callbacks(wmJob *steve, void (*startjob)(void *, short *, short *), - void (*listener)(struct wmJob *, struct wmNotifier *), void (*update)(void *)) { steve->startjob= startjob; - steve->listener= listener; steve->update= update; } |