diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 22:39:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-04 22:39:19 +0400 |
| commit | 22a1ad61f93a4b060500e5295c58b128f24a2daf (patch) | |
| tree | 5693c7acd41e5d325cf3f6f1675cbceb232dd8a4 /source/blender/editors/gpencil | |
| parent | a115c02605b2692710f5d9b64d87407b7ca5b374 (diff) | |
| parent | 937c5494c4933c65635450e66aeacffed74939f2 (diff) | |
svn merge ^/trunk/blender -r42372:42416
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index d40831f9e87..cf3961e0820 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -703,7 +703,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf) dflag |= GP_DRAWDATA_ONLYV2D|GP_DRAWDATA_IEDITHACK; } break; - +#if 0 /* removed since 2.5x, needs to be added back */ case SPACE_SEQ: /* sequence */ { SpaceSeq *sseq= (SpaceSeq *)sa->spacedata.first; @@ -728,7 +728,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf) dflag |= GP_DRAWDATA_ONLYI2D; } break; - +#endif default: /* for spacetype not yet handled */ offsx= 0; offsy= 0; |