lib/origen/sub_blocks.rb in origen-0.31.0 vs lib/origen/sub_blocks.rb in origen-0.32.0

@@ -362,14 +362,16 @@
         materialize.respond_to?(method, include_private)
       end
 
       def materialize
         file = attributes.delete(:file)
+        dir = attributes.delete(:dir) || owner.send(:export_dir)
         block = owner.send(:instantiate_sub_block, name, klass, attributes)
         if file
-          require File.join(owner.send(:export_dir), file)
+          require File.join(dir, file)
           block.extend owner.send(:export_module_names_from_path, file).join('::').constantize
         end
+        block.owner = owner
         block
       end
 
       def ==(obj)
         if obj.is_a?(Placeholder)