[Bf-blender-cvs] [f426d4b] multiview: Small cleanups for eventual merge

[Dalai Felinto]

Commit: f426d4b173d6e0f03a0c4b654dfc2ff1e1b6746e
Author: Dalai Felinto
Date:   Mon Mar 16 15:54:06 2015 +0100
Branches: multiview
https://developer.blender.org/rBf426d4b173d6e0f03a0c4b654dfc2ff1e1b6746e

Small cleanups for eventual merge

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

M	source/blender/compositor/intern/COM_Node.cpp
M	source/blender/compositor/nodes/COM_SwitchViewNode.cpp
M	source/blender/compositor/nodes/COM_SwitchViewNode.h
M	source/blender/compositor/operations/COM_CompositorOperation.h
M	source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
M	source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
M	source/blender/imbuf/intern/stereoimbuf.c
M	source/blender/windowmanager/intern/wm_stereo.c

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

diff --git a/source/blender/compositor/intern/COM_Node.cpp b/source/blender/compositor/intern/COM_Node.cpp
index df21af7..67f4d25 100644
--- a/source/blender/compositor/intern/COM_Node.cpp
+++ b/source/blender/compositor/intern/COM_Node.cpp
@@ -143,6 +143,7 @@ bNodeSocket *Node::getEditorOutputSocket(int editorNodeInputSocketIndex)
 	return NULL;
 }
 
+
 /*******************
  **** NodeInput ****
  *******************/
@@ -213,4 +214,3 @@ void NodeOutput::getEditorValueVector(float *value)
 	RNA_pointer_create((ID *)getNode()->getbNodeTree(), &RNA_NodeSocket, getbNodeSocket(), &ptr);
 	return RNA_float_get_array(&ptr, "default_value", value);
 }
-
diff --git a/source/blender/compositor/nodes/COM_SwitchViewNode.cpp b/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
index 36bb9f1..5a23b8b 100644
--- a/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
+++ b/source/blender/compositor/nodes/COM_SwitchViewNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Blender Foundation.
+ * Copyright 2015, Blender Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/source/blender/compositor/nodes/COM_SwitchViewNode.h b/source/blender/compositor/nodes/COM_SwitchViewNode.h
index e8c63f7..6ab5145 100644
--- a/source/blender/compositor/nodes/COM_SwitchViewNode.h
+++ b/source/blender/compositor/nodes/COM_SwitchViewNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Blender Foundation.
+ * Copyright 2015, Blender Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h
index eca890a..aacbef1 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.h
+++ b/source/blender/compositor/operations/COM_CompositorOperation.h
@@ -75,7 +75,7 @@ private:
 	 * @brief operation is active for calculating final compo result
 	 */
 	bool m_active;
-	
+
 	/**
 	 * @brief View name, used for multiview
 	 */
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
index 060e84a..1497172 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Blender Foundation.
+ * Copyright 2015, Blender Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  *		Lukas Tönne
  *		Dalai Felinto
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
index 265a8c1..25716fd 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013, Blender Foundation.
+ * Copyright 2015, Blender Foundation.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributor: 
- *		Jeroen Bakker 
+ * Contributor:
+ *		Jeroen Bakker
  *		Monique Dewanchand
  *		Lukas Tönne
  *		Dalai Felinto
diff --git a/source/blender/imbuf/intern/stereoimbuf.c b/source/blender/imbuf/intern/stereoimbuf.c
index 3d64222..4090e38 100644
--- a/source/blender/imbuf/intern/stereoimbuf.c
+++ b/source/blender/imbuf/intern/stereoimbuf.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2014 by Blender Foundation
+ * The Original Code is Copyright (C) 2015 by Blender Foundation
  * All rights reserved.
  *
  * The Original Code is: all of this file.
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index d551f00..ee3772b 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * The Original Code is Copyright (C) 2014 by Blender Foundation
+ * The Original Code is Copyright (C) 2015 by Blender Foundation
  * All rights reserved.
  *
  * The Original Code is: all of this file.