diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-06-25 21:31:13 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-06-25 21:31:13 +0400 |
| commit | 399e31187fb3d80a1a66f6b21f1f067924b8a303 (patch) | |
| tree | b86b299dfa2dfcecd6c1aea6a2314f2aeaf0176a | |
| parent | fa8c779c2d3b8c97511d5e27919e833388fe75c1 (diff) | |
Bug 4474
When using the Object buttons (F7) menu to parent an object, a check was
missing if object might have been library data.
| -rw-r--r-- | source/blender/src/drawview.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index f154d395d1c..025d5180d85 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -2106,14 +2106,14 @@ void do_viewbuts(unsigned short event) break; case B_OBJECTPANELPARENT: if(ob) { - if( test_parent_loop(ob->parent, ob) ) + if(ob->id.lib || test_parent_loop(ob->parent, ob) ) ob->parent= NULL; else { DAG_scene_sort(G.scene); DAG_object_flush_update(G.scene, ob, OB_RECALC_OB); - allqueue(REDRAWVIEW3D, 1); - allqueue(REDRAWBUTSOBJECT, 0); } + allqueue(REDRAWVIEW3D, 1); + allqueue(REDRAWBUTSOBJECT, 0); } break; |