[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20576] branches/nurbs/blender/source/ blender: Fix to previous commit.

[Emmanuel Stone]

Revision: 20576
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20576
Author:   eman
Date:     2009-06-02 10:18:54 +0200 (Tue, 02 Jun 2009)

Log Message:
-----------
Fix to previous commit.
I committed some code in error.
Removing broken options.

Modified Paths:
--------------
    branches/nurbs/blender/source/blender/blenkernel/intern/exotic.c
    branches/nurbs/blender/source/blender/src/buttons_editing.c
    branches/nurbs/blender/source/blender/src/header_info.c

Modified: branches/nurbs/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/nurbs/blender/source/blender/blenkernel/intern/exotic.c	2009-06-02 08:10:22 UTC (rev 20575)
+++ branches/nurbs/blender/source/blender/blenkernel/intern/exotic.c	2009-06-02 08:18:54 UTC (rev 20576)
@@ -2437,9 +2437,9 @@
 					retval = 1;
 				}				
 				else if((strncmp(str, "3D Geometry File Format ", 24)==0)) {
-					add_3dm(name);//read_3dm(name);
+		//			add_3dm(name);//read_3dm(name);
 					//displist_to_objects(&lbase);				
-					retval = 1;
+		//			retval = 1;
 				}
 #ifndef DISABLE_PYTHON
 				// TODO: this should not be in the kernel...

Modified: branches/nurbs/blender/source/blender/src/buttons_editing.c
===================================================================
--- branches/nurbs/blender/source/blender/src/buttons_editing.c	2009-06-02 08:10:22 UTC (rev 20575)
+++ branches/nurbs/blender/source/blender/src/buttons_editing.c	2009-06-02 08:18:54 UTC (rev 20576)
@@ -3756,7 +3756,7 @@
 			}
 		//	uiDefBut(block, BUT, B_DEGREEELEVATEU, "Temp Elevate U", 10,130-172,100, 19,0, 0, 0, 0, 0, "Increase the Order of selected surface in U");
 		//	uiDefBut(block, BUT, B_DEGREEREDUCE, "Degree Reduce", 10,130-132,150, 19,0, 0, 0, 0, 0, "FIXME selected");
-			uiDefBut(block, BUT, B_REFINECURVE, "Degree Refine", 10,130-154,150, 19,0, 0, 0, 0, 0, "FIXME selected");
+		//	uiDefBut(block, BUT, B_REFINECURVE, "Degree Refine", 10,130-154,150, 19,0, 0, 0, 0, 0, "FIXME selected");
 
 		}
 	}

Modified: branches/nurbs/blender/source/blender/src/header_info.c
===================================================================
--- branches/nurbs/blender/source/blender/src/header_info.c	2009-06-02 08:10:22 UTC (rev 20575)
+++ branches/nurbs/blender/source/blender/src/header_info.c	2009-06-02 08:18:54 UTC (rev 20576)
@@ -699,8 +699,8 @@
 			 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 0, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "STL...",
 			 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 2, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "3DM...",
-		0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 3, "");
+//	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "3DM...",
+//		0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 3, "");
 #ifndef DISABLE_PYTHON
 	uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");