diff options
author | Antonioya <blendergit@gmail.com> | 2019-01-03 20:10:39 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2019-01-03 20:12:25 +0300 |
commit | a30bdcc142f1241a302107c637fd47be06073d76 (patch) | |
tree | fb35779851e20dc36984d8d41139298e65b720c4 /source/blender/editors/include | |
parent | 4b2198a96ac368fa5f2a353c7c148e015246cccf (diff) |
Fix T60022: Crash when adding grease pencil object to a collection disabled in viewport.
See D4163
Thanks to Habib Gahbiche (@zazizizou) for the fix.
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_gpencil.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h index fb216a8c9a9..c231d0dc355 100644 --- a/source/blender/editors/include/ED_gpencil.h +++ b/source/blender/editors/include/ED_gpencil.h @@ -220,13 +220,13 @@ void ED_gpencil_brush_draw_eraser(struct Brush *brush, int x, int y); /* ----------- Add Primitive Utilities -------------- */ -void ED_gpencil_create_monkey(struct bContext *C, float mat[4][4]); -void ED_gpencil_create_stroke(struct bContext *C, float mat[4][4]); +void ED_gpencil_create_monkey(struct bContext *C, struct Object *ob, float mat[4][4]); +void ED_gpencil_create_stroke(struct bContext *C, struct Object *ob, float mat[4][4]); /* ------------ Object Utilities ------------ */ struct Object *ED_gpencil_add_object( struct bContext *C, struct Scene *scene, const float loc[3], unsigned short local_view_bits); -void ED_gpencil_add_defaults(struct bContext *C); +void ED_gpencil_add_defaults(struct bContext *C, struct Object *ob); /* set object modes */ void ED_gpencil_setup_modes(struct bContext *C, struct bGPdata *gpd, int newmode); |