Commit: 3bacfa08f9a658a41360982741b35435c0146c62
Author: Antonio Vazquez
Date: Mon Jun 11 17:54:32 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3bacfa08f9a658a41360982741b35435c0146c62
Add missing parameter after merge
===================================================================
M source/blender/editors/gpencil/gpencil_fill.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_fill.c
b/source/blender/editors/gpencil/gpencil_fill.c
index 060223bef06..3886ca64167 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -86,6 +86,7 @@
/* Temporary fill operation data (op->customdata) */
typedef struct tGPDfill {
+ struct Main *bmain;
struct Depsgraph *depsgraph;
struct wmWindow *win; /* window where painting originated
*/
struct Scene *scene; /* current scene from context */
@@ -341,7 +342,7 @@ static void gp_render_offscreen(tGPDfill *tgpf)
IMB_rect_from_float(ibuf);
}
- tgpf->ima = BKE_image_add_from_imbuf(ibuf, "GP_fill");
+ tgpf->ima = BKE_image_add_from_imbuf(tgpf->bmain, ibuf, "GP_fill");
tgpf->ima->id.tag |= LIB_TAG_DOIT;
BKE_image_release_ibuf(tgpf->ima, ibuf, NULL);
@@ -969,6 +970,7 @@ static tGPDfill *gp_session_init_fill(bContext *C,
wmOperator *UNUSED(op))
Main *bmain = CTX_data_main(C);
/* set current scene and window info */
+ tgpf->bmain = CTX_data_main(C);
tgpf->scene = CTX_data_scene(C);
tgpf->ob = CTX_data_active_object(C);
tgpf->sa = CTX_wm_area(C);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
