diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 17:02:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 17:02:46 +0300 |
| commit | 204c167c72fe20448200dc0a1504a84762ffd926 (patch) | |
| tree | 5f0adb8c5de4f8a0dd6406eabaa65fd36e3ff5ca /source/blender/makesrna/intern/rna_sculpt_paint.c | |
| parent | 9e439197edcdae1ec9445524bd85bed85249f497 (diff) | |
| parent | 78a8d3685bd3487eb0b5dd55793f94fe7235e377 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_convert.c
source/blender/editors/interface/interface_eyedropper_color.c
source/blender/editors/object/object_add.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_image.c
source/blender/windowmanager/intern/wm_draw.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_sculpt_paint.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 1d6d7c49523..be52a3ffca7 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -412,7 +412,7 @@ static void rna_ImaPaint_canvas_update(bContext *C, PointerRNA *UNUSED(ptr)) SpaceImage *sima = (SpaceImage *)slink; if (!sima->pin) - ED_space_image_set(sima, scene, obedit, ima); + ED_space_image_set(bmain, sima, scene, obedit, ima); } } } |