archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Mango request: added an input node to use track's position in compositor

Browse Source 
--
svn merge -r48088:48089 -r48091:48092 ^/branches/soc-2011-tomato
This commit is contained in:
Sergey Sharybin
2012-07-10 11:01:25 +00:00
parent 5b57f38fb5 72e170d67a
commit 5cc0e5f751
15 changed files with 426 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/editors/space_node/drawnode.c
View File

@@ -52,6 +52,7 @@
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_node.h"
#include "BKE_tracking.h"
#include "BLF_api.h"
#include "BLF_translation.h"
@@ -2525,6 +2526,41 @@ static void node_composit_buts_keying(uiLayout *layout, bContext *UNUSED(C), Poi
uiItemR(layout, ptr, "blur_post", 0, NULL, ICON_NONE);
}
static void node_composit_buts_trackpos(uiLayout *layout, bContext *C, PointerRNA *ptr)
{
bNode *node= ptr->data;
uiTemplateID(layout, C, ptr, "clip", NULL, "CLIP_OT_open", NULL);
if (node->id) {
MovieClip *clip = (MovieClip *) node->id;
MovieTracking *tracking = &clip->tracking;
MovieTrackingObject *object;
uiLayout *col;
PointerRNA tracking_ptr;
NodeTrackPosData *data = node->storage;
RNA_pointer_create(&clip->id, &RNA_MovieTracking, tracking, &tracking_ptr);
col = uiLayoutColumn(layout, 0);
uiItemPointerR(col, ptr, "tracking_object", &tracking_ptr, "objects", "", ICON_OBJECT_DATA);
object = BKE_tracking_object_get_named(tracking, data->tracking_object);
if (object) {
PointerRNA object_ptr;
RNA_pointer_create(&clip->id, &RNA_MovieTrackingObject, object, &object_ptr);
uiItemPointerR(col, ptr, "track_name", &object_ptr, "tracks", "", ICON_ANIM_DATA);
}
else {
uiItemR(layout, ptr, "track_name", 0, "", ICON_ANIM_DATA);
}
uiItemR(layout, ptr, "use_relative", 0, NULL, ICON_NONE);
}
}
/* only once called */
static void node_composit_set_butfunc(bNodeType *ntype)
{
@@ -2723,6 +2759,9 @@ static void node_composit_set_butfunc(bNodeType *ntype)
case CMP_NODE_KEYING:
ntype->uifunc = node_composit_buts_keying;
break;
case CMP_NODE_TRACKPOS:
ntype->uifunc = node_composit_buts_trackpos;
break;
default:
ntype->uifunc = NULL;
}