diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 20:02:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 20:02:46 +0300 |
| commit | 91af8f2ae2b5238839b57eaf74b0f950259ec57a (patch) | |
| tree | 1e7e775c9830041457cbb5771804b8bddfbeee3a /source/blender/editors/sculpt_paint/paint_image.c | |
| parent | 9d77b5d5910b65bed88817169d5444cfb189eb63 (diff) | |
| parent | 66a6d160fe26c1bac7a5dd4cd26cb5fbd5cf348e (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/device/device.cpp
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/util/ed_util.c
source/blender/windowmanager/intern/wm_files_link.c
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 580e42e5974..31d4ede382d 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -1364,7 +1364,7 @@ static int texture_paint_toggle_poll(bContext *C) Object *ob = CTX_data_active_object(C); if (ob == NULL || ob->type != OB_MESH) return 0; - if (!ob->data || ID_IS_LINKED_DATABLOCK(ob->data)) + if (!ob->data || ID_IS_LINKED(ob->data)) return 0; if (CTX_data_edit_object(C)) return 0; |