svn merge ^/trunk/blender -r48288:48302
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 07:44:59 +0000 (07:44 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 07:44:59 +0000 (07:44 +0000)
commit6a58afaaa4515e791da72fc08bc535646b8d8e42
tree1c9b4a4fdd82e671e972607703b6cbb4f9878e66
parent41e256530ae26d8661ae5508faf1dcdaa07e849d
parentd4cfdc69ef95728a39f085283ba812cec856d757
svn merge ^/trunk/blender -r48288:48302
source/blender/compositor/intern/COM_Converter.cpp
source/blender/compositor/nodes/COM_TrackPositionNode.h
source/blender/compositor/operations/COM_ViewerBaseOperation.cpp