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/editors/gpencil | |
| parent | ca2be6912d7dd8b6770a2c00e62d33c7653c21c2 (diff) | |
| parent | da9b1b14ed0ffd29fcff8f4ca64fff5f034532fc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_undo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_undo.c b/source/blender/editors/gpencil/gpencil_undo.c index 5e2be7c41f0..d35df8bc380 100644 --- a/source/blender/editors/gpencil/gpencil_undo.c +++ b/source/blender/editors/gpencil/gpencil_undo.c @@ -179,7 +179,7 @@ void gpencil_undo_push(bGPdata *gpd) /* create new undo node */ undo_node = MEM_callocN(sizeof(bGPundonode), "gpencil undo node"); - undo_node->gpd = BKE_gpencil_data_duplicate(G.main, gpd, true); + undo_node->gpd = BKE_gpencil_data_duplicate(NULL, gpd, true); cur_node = undo_node; |