diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-11-04 23:50:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-04 23:50:09 +0300 |
| commit | 08bbda500530e89b1a0f18006a248529e858511b (patch) | |
| tree | d98daf93fe1a67ac257caac51371d37c77bddd13 /source/blender | |
| parent | e73a2bd55ab7b07fb3650fa812ff07481d84c785 (diff) | |
- Stopping jobs on undo wasnt fixing undo/redo while with render previews as it was supposed to: needed WM_jobs_stop_all rather then WM_jobs_stop because it ends the thread rather then just setting 'stop'.
- gpl header + warning fix
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_deform.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/deform.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index e982806a6cc..8a34b286881 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -44,7 +44,7 @@ void copy_defgroups (struct ListBase *lb1, struct ListBase *lb2); struct bDeformGroup *copy_defgroup (struct bDeformGroup *ingroup); struct bDeformGroup *get_named_vertexgroup (Object *ob, char *name); int get_defgroup_num (struct Object *ob, struct bDeformGroup *dg); -int get_named_vertexgroup_num (Object *ob, char *name); +int get_named_vertexgroup_num (Object *ob, const char *name); void unique_vertexgroup_name (struct bDeformGroup *dg, struct Object *ob); float deformvert_get_weight(const struct MDeformVert *dvert, int group_num); diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index a387d1bca9d..8391ebdebb7 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -537,7 +537,7 @@ static int read_undosave(bContext *C, UndoElem *uel) int success=0, fileflags; /* This is needed so undoing/redoing doesnt crash with threaded previews going */ - WM_jobs_stop(CTX_wm_manager(C), CTX_wm_screen(C)); + WM_jobs_stop_all(CTX_wm_manager(C)); strcpy(scestr, G.sce); /* temporal store */ fileflags= G.fileflags; diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 47736865273..b7949a6e06f 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -110,7 +110,7 @@ bDeformGroup *get_named_vertexgroup (Object *ob, char *name) return NULL; } -int get_named_vertexgroup_num (Object *ob, char *name) +int get_named_vertexgroup_num (Object *ob, const char *name) { /* Return the location of the named deform group within the list of * deform groups. This function is a combination of get_defgroup_num and |