Merge 1bb4bfe1f5 into 2e3b37a4f8

2016-01-19 02:10:14 +00:00 · 2016-01-19 02:10:14 +00:00 · 421ab5fe21
parent 2e3b37a4f8 1bb4bfe1f5
commit 421ab5fe21
1 changed files with 1 additions and 1 deletions
--- a/lib/compiler.js
+++ b/lib/compiler.js
@ -86,7 +86,7 @@ module.exports = function compile(options) {
  var modelInstructions = buildAllModelInstructions(
    modelsRootDir, modelsConfig, modelSources, options.modelDefinitions);

-  var mixinDirs = options.mixinDirs || [];
+  var mixinDirs = options.mixinDirs || modelsMeta.mixinDirs || [];
  var mixinSources = options.mixinSources || modelsMeta.mixins || ['./mixins'];
  var mixinInstructions = buildAllMixinInstructions(
    appRootDir, mixinDirs, mixinSources, options, modelInstructions);