diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 25fac31b7ba..b87f1058070 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -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", ""}, diff --git a/tools/Blender.py b/tools/Blender.py index 4cd315f3195..9b54435c1e7 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -730,9 +730,10 @@ class BlenderEnvironment(SConsEnvironment): 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])