diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 07:07:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 07:07:14 +0400 |
| commit | 81f5c9ed9b8193864f1c6160aed9eef9338f0d27 (patch) | |
| tree | de71a52d3ed2c5a1fd47a846af5d68e1c571e606 /source/blender/editors/interface/interface_templates.c | |
| parent | 50ca81154e5ead104723ba137942e92cb860ace8 (diff) | |
| parent | 792452a7e53aa92361145e415491943bc91d8a6e (diff) | |
svn merge ^/trunk/blender -r42991:43009
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 63f6309163e..6b842a6d409 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2201,6 +2201,17 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe } uiDefButR(block, OPTION, 0, "", 0, 0, UI_UNIT_X, UI_UNIT_Y, itemptr, "is_active", i, 0, 0, 0, 0, NULL); } + else if(itemptr->type == &RNA_MovieTrackingObject) { + MovieTrackingObject *tracking_object= (MovieTrackingObject*)itemptr->data; + + split= uiLayoutSplit(sub, 0.75f, 0); + if(tracking_object->flag&TRACKING_OBJECT_CAMERA) { + uiItemL(split, name, ICON_CAMERA_DATA); + } + else { + uiItemL(split, name, ICON_OBJECT_DATA); + } + } /* There is a last chance to display custom controls (in addition to the name/label): * If the given item property group features a string property named as prop_list, |