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/physics | |
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/physics')
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_object.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 67ba1a1312a..e93382435db 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -4761,7 +4761,7 @@ static int particle_edit_toggle_poll(bContext *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; diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 1e643ea7277..c4ed32e8743 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -997,7 +997,7 @@ static void remove_particle_systems_from_object(Object *ob_to) if (ob_to->type != OB_MESH) return; - if (!ob_to->data || ID_IS_LINKED_DATABLOCK(ob_to->data)) + if (!ob_to->data || ID_IS_LINKED(ob_to->data)) return; for (md = ob_to->modifiers.first; md; md = md_next) { @@ -1038,7 +1038,7 @@ static bool copy_particle_systems_to_object(const bContext *C, if (ob_to->type != OB_MESH) return false; - if (!ob_to->data || ID_IS_LINKED_DATABLOCK(ob_to->data)) + if (!ob_to->data || ID_IS_LINKED(ob_to->data)) return false; /* For remapping we need a valid DM. |