[Bf-blender-cvs] [70ed441] soc-2014-nurbs: Moved files into position for merge with soc-2014-nurbs branch.
Jonathan deWerd
noreply at git.blender.org
Fri Jun 27 08:14:57 CEST 2014
Commit: 70ed4412d44932d76220c1319cae032f773ae196
Author: Jonathan deWerd
Date: Fri Jun 27 01:58:09 2014 -0400
https://developer.blender.org/rB70ed4412d44932d76220c1319cae032f773ae196
Moved files into position for merge with soc-2014-nurbs branch.
===================================================================
D PolyTest.xcodeproj/project.pbxproj
D PolyTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
D PolyTest/GridMesh.cpp
D PolyTest/GridMesh.h
D PolyTest/GridMesh_demo.cpp
D PolyTest/poly.h
D PolyTest/poly_demo.cpp
D PolyTest/rast_demo.cpp
A source/blender/editors/curve/GridMesh.cpp
A source/blender/editors/curve/GridMesh.h
A source/blender/editors/curve/GridMesh_demo.cpp
A source/blender/editors/curve/poly.h
A source/blender/editors/curve/poly_demo.cpp
A source/blender/editors/curve/rast_demo.cpp
===================================================================
diff --git a/PolyTest.xcodeproj/project.pbxproj b/PolyTest.xcodeproj/project.pbxproj
deleted file mode 100644
index f27fed6..0000000
--- a/PolyTest.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,413 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 46;
- objects = {
-
-/* Begin PBXBuildFile section */
- FC35456E194BDF2300F3D236 /* poly_demo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC35456D194BDF2300F3D236 /* poly_demo.cpp */; };
- FC354571194BDF7300F3D236 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC354570194BDF7300F3D236 /* OpenGL.framework */; };
- FC354573194BDF7E00F3D236 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC354572194BDF7E00F3D236 /* GLUT.framework */; };
- FC458BC71953F95A00E260AC /* GridMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC458BC51953F95A00E260AC /* GridMesh.cpp */; };
- FC4C01831959FA25005025E0 /* GridMesh_demo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC4C01821959FA25005025E0 /* GridMesh_demo.cpp */; };
- FC67C07A19514DE10077AB72 /* rast_demo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC67C07919514DE10077AB72 /* rast_demo.cpp */; };
- FC67C08019515CBB0077AB72 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC354572194BDF7E00F3D236 /* GLUT.framework */; };
- FC67C08119515CBF0077AB72 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC354570194BDF7300F3D236 /* OpenGL.framework */; };
- FCCF3BC7195A205400CCA487 /* GridMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC458BC51953F95A00E260AC /* GridMesh.cpp */; };
- FCCF3BC8195A207E00CCA487 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC354572194BDF7E00F3D236 /* GLUT.framework */; };
- FCCF3BC9195A208200CCA487 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC354570194BDF7300F3D236 /* OpenGL.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
- FC35455F194BDED000F3D236 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = /usr/share/man/man1/;
- dstSubfolderSpec = 0;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- };
- FC4C017E1959FA25005025E0 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = /usr/share/man/man1/;
- dstSubfolderSpec = 0;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- };
- FC67C07519514DE00077AB72 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = /usr/share/man/man1/;
- dstSubfolderSpec = 0;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 1;
- };
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
- FC354561194BDED000F3D236 /* PolyTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = PolyTest; sourceTree = BUILT_PRODUCTS_DIR; };
- FC35456D194BDF2300F3D236 /* poly_demo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = poly_demo.cpp; sourceTree = "<group>"; };
- FC35456F194BDF3700F3D236 /* poly.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = poly.h; sourceTree = "<group>"; };
- FC354570194BDF7300F3D236 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
- FC354572194BDF7E00F3D236 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = System/Library/Frameworks/GLUT.framework; sourceTree = SDKROOT; };
- FC458BC51953F95A00E260AC /* GridMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GridMesh.cpp; sourceTree = "<group>"; };
- FC458BC61953F95A00E260AC /* GridMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridMesh.h; sourceTree = "<group>"; };
- FC4C01801959FA25005025E0 /* GridMesh_demo */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = GridMesh_demo; sourceTree = BUILT_PRODUCTS_DIR; };
- FC4C01821959FA25005025E0 /* GridMesh_demo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GridMesh_demo.cpp; sourceTree = "<group>"; };
- FC67C07719514DE10077AB72 /* rast_demo */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = rast_demo; sourceTree = BUILT_PRODUCTS_DIR; };
- FC67C07919514DE10077AB72 /* rast_demo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = rast_demo.cpp; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- FC35455E194BDED000F3D236 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FC354573194BDF7E00F3D236 /* GLUT.framework in Frameworks */,
- FC354571194BDF7300F3D236 /* OpenGL.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- FC4C017D1959FA25005025E0 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FCCF3BC9195A208200CCA487 /* OpenGL.framework in Frameworks */,
- FCCF3BC8195A207E00CCA487 /* GLUT.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- FC67C07419514DE00077AB72 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FC67C08119515CBF0077AB72 /* OpenGL.framework in Frameworks */,
- FC67C08019515CBB0077AB72 /* GLUT.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- FC354558194BDED000F3D236 = {
- isa = PBXGroup;
- children = (
- FC354572194BDF7E00F3D236 /* GLUT.framework */,
- FC354570194BDF7300F3D236 /* OpenGL.framework */,
- FC354563194BDED000F3D236 /* PolyTest */,
- FC354562194BDED000F3D236 /* Products */,
- );
- sourceTree = "<group>";
- };
- FC354562194BDED000F3D236 /* Products */ = {
- isa = PBXGroup;
- children = (
- FC354561194BDED000F3D236 /* PolyTest */,
- FC67C07719514DE10077AB72 /* rast_demo */,
- FC4C01801959FA25005025E0 /* GridMesh_demo */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- FC354563194BDED000F3D236 /* PolyTest */ = {
- isa = PBXGroup;
- children = (
- FC35456F194BDF3700F3D236 /* poly.h */,
- FC35456D194BDF2300F3D236 /* poly_demo.cpp */,
- FC67C07919514DE10077AB72 /* rast_demo.cpp */,
- FC4C01821959FA25005025E0 /* GridMesh_demo.cpp */,
- FC458BC51953F95A00E260AC /* GridMesh.cpp */,
- FC458BC61953F95A00E260AC /* GridMesh.h */,
- );
- path = PolyTest;
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- FC354560194BDED000F3D236 /* PolyTest */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = FC35456A194BDED000F3D236 /* Build configuration list for PBXNativeTarget "PolyTest" */;
- buildPhases = (
- FC35455D194BDED000F3D236 /* Sources */,
- FC35455E194BDED000F3D236 /* Frameworks */,
- FC35455F194BDED000F3D236 /* CopyFiles */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = PolyTest;
- productName = PolyTest;
- productReference = FC354561194BDED000F3D236 /* PolyTest */;
- productType = "com.apple.product-type.tool";
- };
- FC4C017F1959FA25005025E0 /* GridMesh_demo */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = FC4C01881959FA25005025E0 /* Build configuration list for PBXNativeTarget "GridMesh_demo" */;
- buildPhases = (
- FC4C017C1959FA25005025E0 /* Sources */,
- FC4C017D1959FA25005025E0 /* Frameworks */,
- FC4C017E1959FA25005025E0 /* CopyFiles */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = GridMesh_demo;
- productName = GridMesh_demo;
- productReference = FC4C01801959FA25005025E0 /* GridMesh_demo */;
- productType = "com.apple.product-type.tool";
- };
- FC67C07619514DE00077AB72 /* rast_demo */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = FC67C07F19514DE10077AB72 /* Build configuration list for PBXNativeTarget "rast_demo" */;
- buildPhases = (
- FC67C07319514DE00077AB72 /* Sources */,
- FC67C07419514DE00077AB72 /* Frameworks */,
- FC67C07519514DE00077AB72 /* CopyFiles */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = rast_demo;
- productName = rast_demo;
- productReference = FC67C07719514DE10077AB72 /* rast_demo */;
- productType = "com.apple.product-type.tool";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- FC354559194BDED000F3D236 /* Project object */ = {
- isa = PBXProject;
- attributes = {
- LastUpgradeCheck = 0510;
- ORGANIZATIONNAME = a.b.c;
- };
- buildConfigurationList = FC35455C194BDED000F3D236 /* Build configuration list for PBXProject "PolyTest" */;
- compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
- hasScannedForEncodings = 0;
- knownRegions = (
- en,
- );
- mainGroup = FC354558194BDED000F3D236;
- productRefGroup = FC354562194BDED000F3D236 /* Products */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- FC354560194BDED000F3D236 /* PolyTest */,
- FC67C07619514DE00077AB72 /* rast_demo */,
- FC4C017F1959FA25005025E0 /* GridMesh_demo */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
- FC35455D194BDED000F3D236 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FC35456E194BDF2300F3D236 /* poly_demo.cpp in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
- FC4C017C1959FA25005025E0 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- FCCF3BC7195A205400CCA487 /* GridMesh.cpp in Sources */,
- FC4C01831959FA25005025E0 /* GridMesh_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list