diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-15 17:02:37 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-15 17:02:37 +0400 |
| commit | 30293dc2ca8052ad0c7113c77365feca590f4d05 (patch) | |
| tree | c5f4a092be7204ef2107792c0a16c0d9f331dbba /source/blender/editors/util | |
| parent | e715a7185ca176c8a73cd638d4acaa40f75a7d77 (diff) | |
| parent | 9648c6016b35a72aa23395f5d200e342df16490b (diff) | |
svn merge -r39834:40222 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/editors/util')
| -rw-r--r-- | source/blender/editors/util/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/editors/util/undo.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript index cfbf1c83079..fffd2670814 100644 --- a/source/blender/editors/util/SConscript +++ b/source/blender/editors/util/SConscript @@ -8,4 +8,4 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna' incs += ' ../../blenloader' -env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core'], priority=[130] ) +env.BlenderLib ( 'bf_editors_util', sources, Split(incs), [], libtype=['core','player'], priority=[330,210] ) diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 4fedf35acd1..21420d88899 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -56,6 +56,7 @@ #include "ED_armature.h" #include "ED_particle.h" #include "ED_curve.h" +#include "ED_gpencil.h" #include "ED_mball.h" #include "ED_mesh.h" #include "ED_object.h" @@ -128,6 +129,11 @@ static int ed_undo_step(bContext *C, int step, const char *undoname) Object *obact= CTX_data_active_object(C); ScrArea *sa= CTX_wm_area(C); + /* grease pencil can be can be used in plenty of spaces, so check it first */ + if(ED_gpencil_session_active()) { + return ED_undo_gpencil_step(C, step, undoname); + } + if(sa && sa->spacetype==SPACE_IMAGE) { SpaceImage *sima= (SpaceImage *)sa->spacedata.first; |