[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45310] branches/soc-2011-avocado/blender: post-merge cleanup

[Andrea Weikert]

Revision: 45310
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45310
Author:   elubie
Date:     2012-03-31 16:09:40 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
post-merge cleanup

* more fixing of some line endings (adding svn properties)
* remove unneeded internal bmesh header
* added back sequence plugin Makefile, somehow got lost

Modified Paths:
--------------
    branches/soc-2011-avocado/blender/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c

Added Paths:
-----------
    branches/soc-2011-avocado/blender/release/plugins/sequence/Makefile

Removed Paths:
-------------
    branches/soc-2011-avocado/blender/source/blender/bmesh/intern/in-progress/

Property Changed:
----------------
    branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/soc-2011-avocado/blender/release/scripts/modules/animsys_refactor.py
    branches/soc-2011-avocado/blender/release/scripts/modules/bpy/path.py
    branches/soc-2011-avocado/blender/release/scripts/modules/bpyml.py
    branches/soc-2011-avocado/blender/release/scripts/modules/bpyml_ui.py
    branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_clip.py


Property changes on: branches/soc-2011-avocado/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
___________________________________________________________________
Added: svn:eol-style
   + native

Added: branches/soc-2011-avocado/blender/release/plugins/sequence/Makefile
===================================================================
--- branches/soc-2011-avocado/blender/release/plugins/sequence/Makefile	                        (rev 0)
+++ branches/soc-2011-avocado/blender/release/plugins/sequence/Makefile	2012-03-31 16:09:40 UTC (rev 45310)
@@ -0,0 +1,32 @@
+# ***** 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) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+all: plugins
+
+plugins:
+	@/bin/sh -c 'for i in *.c; do ../bmake $$i; done;'
+
+clean:
+	rm -rf *.o *.so


Property changes on: branches/soc-2011-avocado/blender/release/plugins/sequence/Makefile
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-avocado/blender/release/scripts/modules/animsys_refactor.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-avocado/blender/release/scripts/modules/bpy/path.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-avocado/blender/release/scripts/modules/bpyml.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-avocado/blender/release/scripts/modules/bpyml_ui.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/clip.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_clip.py
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: branches/soc-2011-avocado/blender/source/blender/editors/mesh/CMakeLists.txt
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/editors/mesh/CMakeLists.txt	2012-03-31 14:56:00 UTC (rev 45309)
+++ branches/soc-2011-avocado/blender/source/blender/editors/mesh/CMakeLists.txt	2012-03-31 16:09:40 UTC (rev 45310)
@@ -25,14 +25,16 @@
 	../../blenlib
 	../../blenloader
 	../../bmesh
-	../../bmesh/intern/
 	../../imbuf
 	../../makesdna
 	../../makesrna
 	../../render/extern/include
 	../../windowmanager
 	../../../../intern/guardedalloc
-	../../../../intern/autoseam/
+	../../../../intern/autoseam
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -48,6 +50,7 @@
 	mesh_data.c
 	mesh_ops.c
 	meshtools.c
+
 	editmesh_bvh.h
 	mesh_intern.h
 	autoseam_tools.c

Modified: branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c	2012-03-31 14:56:00 UTC (rev 45309)
+++ branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c	2012-03-31 16:09:40 UTC (rev 45310)
@@ -42,7 +42,6 @@
 #include "BLI_math.h"
 #include "bmesh.h"
 
-#include "bmesh_private.h"
 #include "WM_types.h"
 #include "BKE_material.h"
 #include "BKE_context.h"