diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-06 02:13:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-06 02:13:10 +0400 |
| commit | 3937ec7d11996438c2c6bd65d1d88f72431b1d52 (patch) | |
| tree | e0a2104d51f1a44de88047a0e9d17d8492b343b1 /source/blender/editors/gpencil | |
| parent | 11d5a2d2eba127e2f8502e570addb08c22cbb9c1 (diff) | |
| parent | 8f3170a17c270dd8a02f9b3bf2a971a65cab67ae (diff) | |
svn merge ^/trunk/blender -r43887:43918
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 6c93727bf55..99572345c96 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1117,14 +1117,6 @@ static int gp_session_initdata (bContext *C, tGPsdata *p) p->custom_color[1]= 0.0f; p->custom_color[2]= 0.5f; p->custom_color[3]= 0.9f; - - /* check that gpencil data is allowed to be drawn */ - if ((sc->flag & SC_SHOW_GPENCIL)==0) { - p->status= GP_STATUS_ERROR; - if (G.f & G_DEBUG) - printf("Error: In active view, Grease Pencil not shown \n"); - return 0; - } } break; |