Merge with -r 22620:23107.
[blender.git] / source / blender / imbuf / SConscript
index cdc1a5f52571fb4b5cca9bfc7e215d782c2be980..6052b344da7f83168b7d75a7977cff7174d8beb7 100644 (file)
@@ -35,4 +35,4 @@ if env['WITH_BF_QUICKTIME']:
        incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
        defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [185] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [185,115] )