[Bf-blender-cvs] [bf86d65] multiview: Merge remote-tracking branch 'upstream/master' into multiview

[Dalai Felinto]

Commit: bf86d65273a5a4e16d47ddf8d95749ef32b35742
Author: Dalai Felinto
Date:   Wed Jul 30 11:15:23 2014 -0300
Branches: multiview
https://developer.blender.org/rBbf86d65273a5a4e16d47ddf8d95749ef32b35742

Merge remote-tracking branch 'upstream/master' into multiview

===================================================================



===================================================================

diff --cc source/blender/compositor/intern/COM_Converter.cpp
index 9fc06f0,99f66bc..9de2261
--- a/source/blender/compositor/intern/COM_Converter.cpp
+++ b/source/blender/compositor/intern/COM_Converter.cpp
@@@ -99,8 -99,8 +99,9 @@@ extern "C" 
  #include "COM_SetValueOperation.h"
  #include "COM_SplitViewerNode.h"
  #include "COM_Stabilize2dNode.h"
+ #include "COM_SunBeamsNode.h"
  #include "COM_SwitchNode.h"
 +#include "COM_SwitchViewNode.h"
  #include "COM_TextureNode.h"
  #include "COM_TimeNode.h"
  #include "COM_TonemapNode.h"