[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25907] branches/bmesh/blender: pre-merge commit

[Joseph Eagar]

Revision: 25907
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25907
Author:   joeedh
Date:     2010-01-12 00:09:46 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
pre-merge commit

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
    branches/bmesh/blender/tools/Blender.py

Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c	2010-01-11 20:27:52 UTC (rev 25906)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c	2010-01-11 23:09:46 UTC (rev 25907)
@@ -45,7 +45,7 @@
 
 #include "WM_api.h"
 #include "WM_types.h"
-
+//bleh
 EnumPropertyItem object_mode_items[] = {
 	{OB_MODE_OBJECT, "OBJECT", ICON_OBJECT_DATAMODE, "Object", ""},
 	{OB_MODE_EDIT, "EDIT", ICON_EDITMODE_HLT, "Edit", ""},

Modified: branches/bmesh/blender/tools/Blender.py
===================================================================
--- branches/bmesh/blender/tools/Blender.py	2010-01-11 20:27:52 UTC (rev 25906)
+++ branches/bmesh/blender/tools/Blender.py	2010-01-11 23:09:46 UTC (rev 25907)
@@ -730,9 +730,10 @@
 			 lenv.Append(LIBS = lenv['BF_QUICKTIME_LIB'])
 			 lenv.Append(LIBPATH = lenv['BF_QUICKTIME_LIBPATH'])
 		prog = lenv.Program(target=builddir+'bin/'+progname, source=sources)
+		
 		#needed for incremental linking
 		if lenv['OURPLATFORM'] == 'win32-vc': prog = lenv.Precious(prog)
-	
+		
 		if lenv['BF_DEBUG'] and lenv['OURPLATFORM']=='win32-vc' and lenv['BF_BSC']:
 			f = lenv.File(progname + '.bsc', builddir)
 			brs = lenv.Command(f, prog, [bsc])