[Bf-blender-cvs] [8f4f6f3] multiview: Merge branch 'master' into multiview

[Campbell Barton]

Commit: 8f4f6f34054190711742d58c1a8f51e91417169e
Author: Campbell Barton
Date:   Mon Nov 24 12:05:47 2014 +0100
Branches: multiview
https://developer.blender.org/rB8f4f6f34054190711742d58c1a8f51e91417169e

Merge branch 'master' into multiview

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



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

diff --cc source/blender/nodes/composite/node_composite_tree.c
index 2004163,1883b08..f4bb284
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@@ -231,17 -231,15 +231,16 @@@ void *COM_linker_hack = NULL
  
  void ntreeCompositExecTree(Scene *scene, bNodeTree *ntree, RenderData *rd, int rendering, int do_preview,
                             const ColorManagedViewSettings *view_settings,
 -                           const ColorManagedDisplaySettings *display_settings)
 +                           const ColorManagedDisplaySettings *display_settings,
 +                           const char *view_name)
  {
  #ifdef WITH_COMPOSITOR
 -	COM_execute(rd, scene, ntree, rendering, view_settings, display_settings);
 +	COM_execute(rd, scene, ntree, rendering, view_settings, display_settings, view_name);
  #else
- 	(void)scene, (void)ntree, (void)rd, (void)rendering, (void)do_preview;
- 	(void)view_settings, (void)display_settings, (void)view_name;
 -	UNUSED_VARS(scene, ntree, rd, rendering, view_settings, display_settings);
++	UNUSED_VARS(scene, ntree, rd, rendering, view_settings, display_settings, view_name);
  #endif
  
- 	(void)do_preview;
+ 	UNUSED_VARS(do_preview);
  }
  
  /* *********************************************** */