diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 05:39:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 05:39:57 +0400 |
| commit | 705f23064e8ba3e96690d163c98687fc79d4a179 (patch) | |
| tree | 13251a1f24cfb219a62c4f64c6750cadec7ff712 /source/blender/editors/object/object_relations.c | |
| parent | 9e59fed5d8ff9f63477b3a73d2b02eaa55abd6cd (diff) | |
| parent | dbdd1c2ea7496546f4f7e17350720a6005cdb187 (diff) | |
svn merge ^/trunk/blender -r43294:43338
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 56fd1b4409a..3aa604d48c0 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1054,7 +1054,7 @@ static unsigned int move_to_layer_init(bContext *C, wmOperator *op) int values[20], a; unsigned int lay= 0; - if(!RNA_property_is_set(op->ptr, "layers")) { + if(!RNA_struct_property_is_set(op->ptr, "layers")) { /* note: layers are set in bases, library objects work for this */ CTX_DATA_BEGIN(C, Base*, base, selected_bases) { lay |= base->lay; |