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/makesrna | |
| 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/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index d24b2ccc91d..d088a7c23e6 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -1772,7 +1772,7 @@ bool RNA_property_editable(PointerRNA *ptr, PropertyRNA *prop) return ((flag & PROP_EDITABLE) && (flag & PROP_REGISTER) == 0 && - (!id || !ID_IS_LINKED_DATABLOCK(id) || (prop->flag & PROP_LIB_EXCEPTION))); + (!id || !ID_IS_LINKED(id) || (prop->flag & PROP_LIB_EXCEPTION))); } /** @@ -1798,7 +1798,7 @@ bool RNA_property_editable_info(PointerRNA *ptr, PropertyRNA *prop, const char * } /* property from linked data-block */ - if (id && ID_IS_LINKED_DATABLOCK(id) && (prop->flag & PROP_LIB_EXCEPTION) == 0) { + if (id && ID_IS_LINKED(id) && (prop->flag & PROP_LIB_EXCEPTION) == 0) { if (!(*r_info)[0]) { *r_info = "Can't edit this property from a linked data-block."; } @@ -1840,7 +1840,7 @@ bool RNA_property_editable_index(PointerRNA *ptr, PropertyRNA *prop, int index) id = ptr->id.data; - return (flag & PROP_EDITABLE) && (!id || !ID_IS_LINKED_DATABLOCK(id) || (prop->flag & PROP_LIB_EXCEPTION)); + return (flag & PROP_EDITABLE) && (!id || !ID_IS_LINKED(id) || (prop->flag & PROP_LIB_EXCEPTION)); } bool RNA_property_animateable(PointerRNA *ptr, PropertyRNA *prop) diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 02f3b048f3a..313cc08c415 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -826,10 +826,10 @@ static int rna_Object_active_material_editable(PointerRNA *ptr, const char **UNU bool is_editable; if ((ob->matbits == NULL) || (ob->actcol == 0) || ob->matbits[ob->actcol - 1]) { - is_editable = !ID_IS_LINKED_DATABLOCK(ob); + is_editable = !ID_IS_LINKED(ob); } else { - is_editable = ob->data ? !ID_IS_LINKED_DATABLOCK(ob->data) : false; + is_editable = ob->data ? !ID_IS_LINKED(ob->data) : false; } return is_editable ? PROP_EDITABLE : 0; |