diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:25:41 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-15 18:25:41 +0300 |
| commit | 5b6ae0523e18fbc94ba523e20f6c783cb8b3aa89 (patch) | |
| tree | 478091477aea6fc67186cfcf2ddcd17a214b1366 /source/blender/blenkernel/intern | |
| parent | ca2be6912d7dd8b6770a2c00e62d33c7653c21c2 (diff) | |
| parent | da9b1b14ed0ffd29fcff8f4ca64fff5f034532fc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/gpencil.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 9b79415f006..6a59ea4439f 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -805,6 +805,7 @@ bGPdata *BKE_gpencil_data_duplicate(Main *bmain, const bGPdata *gpd_src, bool in return gpd_dst; } else { + BLI_assert(bmain != NULL); bGPdata *gpd_copy; BKE_id_copy_ex(bmain, &gpd_src->id, (ID **)&gpd_copy, 0, false); return gpd_copy; |