Merge branch '15.06'

* 15.06:
  Implement rendering the top 5 layers solid and with infill
  Add a createMesh function to LayerData::Layer that creates a mesh from a layer
  Add support for line width and infill types to LayerData::Polygon
  Use the new layer message properties to properly create layers
  Do not render the convex hull node unless the object is selected
  Update generated protobuf protocol file as per CuraEngine changes
  helps with making the messagestack adapt to the total size of messages + pogressbar
  Defines the style of the progressbar
  Makes the openfile button blue/active as long as there is no file loaded.
This commit is contained in:
Arjen Hiemstra 2015-06-16 14:06:57 +02:00
commit 46576ba5e7
7 changed files with 322 additions and 88 deletions

View file

@ -48,6 +48,9 @@ class ConvexHullNode(SceneNode):
self.setMeshData(mesh)
def getWatchedNode(self):
return self._node
def render(self, renderer):
if not self._material:
self._material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "color.frag"))