svn merge ^/trunk/blender -r44024:44076

2 files changed, 26 insertions, 4 deletions

diff --git a/source/blender/blenlib/BLI_callbacks.h b/source/blender/blenlib/BLI_callbacks.h
index 7e4fad54cda..201ada45acf 100644
--- a/source/blender/blenlib/BLI_callbacks.h
+++ b/source/blender/blenlib/BLI_callbacks.h
@@ -29,7 +29,6 @@
  *  \ingroup bli
  */
 
-
 #ifndef BLI_CALLBACKS_H
 #define BLI_CALLBACKS_H
 
@@ -64,12 +63,11 @@ typedef struct {
 void BLI_exec_cb(struct Main *main, struct ID *self, eCbEvent evt);
 void BLI_add_cb(bCallbackFuncStore *funcstore, eCbEvent evt);
 
-#endif
-
-
 void BLI_cb_init(void);
 void BLI_cb_finalize(void);
 
 
 /* This is blenlib internal only, unrelated to above */
 void callLocalErrorCallBack(const char* msg);
+
+#endif /* BLI_CALLBACKS_H */
diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index f625c7bb2d4..056bba71dea 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -1,3 +1,27 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
 #ifndef BLI_GRAPH_H_
 #define BLI_GRAPH_H_