[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59451] trunk/blender: add GPL header to treehash.c and add missing includes to cmake.
Campbell Barton
ideasman42 at gmail.com
Sat Aug 24 05:17:29 CEST 2013
Revision: 59451
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59451
Author: campbellbarton
Date: 2013-08-24 03:17:28 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
add GPL header to treehash.c and add missing includes to cmake.
Modified Paths:
--------------
trunk/blender/intern/CMakeLists.txt
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/guardedalloc/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/treehash.c
Modified: trunk/blender/intern/CMakeLists.txt
===================================================================
--- trunk/blender/intern/CMakeLists.txt 2013-08-24 03:16:22 UTC (rev 59450)
+++ trunk/blender/intern/CMakeLists.txt 2013-08-24 03:17:28 UTC (rev 59451)
@@ -23,6 +23,7 @@
#
# ***** END GPL LICENSE BLOCK *****
+# add_subdirectory(atomic) # header only
add_subdirectory(string)
add_subdirectory(ghost)
add_subdirectory(guardedalloc)
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2013-08-24 03:16:22 UTC (rev 59450)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2013-08-24 03:17:28 UTC (rev 59451)
@@ -22,6 +22,7 @@
kernel.h
kernel_accumulate.h
kernel_bvh.h
+ kernel_bvh_subsurface.h
kernel_bvh_traversal.h
kernel_camera.h
kernel_compat_cpu.h
Modified: trunk/blender/intern/guardedalloc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/guardedalloc/CMakeLists.txt 2013-08-24 03:16:22 UTC (rev 59450)
+++ trunk/blender/intern/guardedalloc/CMakeLists.txt 2013-08-24 03:17:28 UTC (rev 59451)
@@ -36,6 +36,9 @@
./intern/mallocn.c
MEM_guardedalloc.h
+
+ # include here since its a header-only
+ ../atomic/atomic_ops.h
)
if(WIN32 AND NOT UNIX)
Modified: trunk/blender/source/blender/blenkernel/intern/treehash.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/treehash.c 2013-08-24 03:16:22 UTC (rev 59450)
+++ trunk/blender/source/blender/blenkernel/intern/treehash.c 2013-08-24 03:17:28 UTC (rev 59451)
@@ -1,3 +1,33 @@
+/*
+ * ***** 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.
+ *
+ * Contributor(s): Blender Foundation 2013
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file treehash.c
+ * \ingroup bke
+ *
+ * Tree hash for the outliner space.
+ */
+
+#include <stdlib.h>
+
#include "BKE_treehash.h"
#include "BLI_ghash.h"
More information about the Bf-blender-cvs
mailing list