[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12861] trunk/blender/source/blender/src/ space.c: Whoops! Temporarily uncommitting some work-in-progress code ( it would have broken compiling)

[Joshua Leung]

Revision: 12861
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12861
Author:   aligorith
Date:     2007-12-13 03:11:26 +0100 (Thu, 13 Dec 2007)

Log Message:
-----------
Whoops! Temporarily uncommitting some work-in-progress code (it would have broken compiling)

Modified Paths:
--------------
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2007-12-13 02:08:47 UTC (rev 12860)
+++ trunk/blender/source/blender/src/space.c	2007-12-13 02:11:26 UTC (rev 12861)
@@ -1897,7 +1897,7 @@
 						addsegment_nurb();
 					}
 					else if(G.obedit->type == OB_ARMATURE) {
-						fill_bones_armature();
+						//fill_bones_armature();
 					}
 				}
 				else if(G.qual==LR_CTRLKEY)
@@ -2166,7 +2166,7 @@
 							DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
 						}
 						else if (G.obedit == OB_ARMATURE) {
-							merge_armature();
+							//merge_armature();
 						}
 					}
 					else if ((G.qual==0) || (G.qual==LR_CTRLKEY)) {