From dcb5a5663f6c50f69d21c224968b986e87e6d30d Mon Sep 17 00:00:00 2001
From: Mikulas Florek <mikulas.florek@gamedev.sk>
Date: Fri, 14 Nov 2014 01:13:37 +0100
Subject: [PATCH] some new labels in the editor

---
 qteditor/QtEditor/assetbrowser.ui | 30 +++++++++++++++++++++++++++++-
 qteditor/QtEditor/entity_list.ui  | 30 +++++++++++++++++++++++++++++-
 src/graphics/culling_system.cpp   |  2 --
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/qteditor/QtEditor/assetbrowser.ui b/qteditor/QtEditor/assetbrowser.ui
index 6f7457848..9440f3884 100644
--- a/qteditor/QtEditor/assetbrowser.ui
+++ b/qteditor/QtEditor/assetbrowser.ui
@@ -31,7 +31,35 @@
      <number>2</number>
     </property>
     <item>
-     <widget class="QLineEdit" name="searchInput"/>
+     <widget class="QWidget" name="widget" native="true">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Filter</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="searchInput"/>
+       </item>
+      </layout>
+     </widget>
     </item>
     <item>
      <widget class="QComboBox" name="filterComboBox">
diff --git a/qteditor/QtEditor/entity_list.ui b/qteditor/QtEditor/entity_list.ui
index 74ca3a683..b072c7c21 100644
--- a/qteditor/QtEditor/entity_list.ui
+++ b/qteditor/QtEditor/entity_list.ui
@@ -72,7 +72,35 @@
      </widget>
     </item>
     <item>
-     <widget class="QLineEdit" name="nameFilterEdit"/>
+     <widget class="QWidget" name="widget" native="true">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Filter</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="nameFilterEdit"/>
+       </item>
+      </layout>
+     </widget>
     </item>
     <item>
      <widget class="QTreeView" name="entityList">
diff --git a/src/graphics/culling_system.cpp b/src/graphics/culling_system.cpp
index ee474a9f6..5bd74b168 100644
--- a/src/graphics/culling_system.cpp
+++ b/src/graphics/culling_system.cpp
@@ -34,8 +34,6 @@ namespace Lumix
 
 	class CullingJob : public MTJD::Job
 	{
-		friend class ResultsCollectorJob;
-
 	public:
 		CullingJob(const CullingSystem::InputSpheres& spheres, const CullingSystem::Indexes& indexes, CullingSystem::Results& results, int start, int end, const Frustum& frustum, MTJD::Manager& manager, IAllocator& allocator)
 			: Job(true, MTJD::Priority::Default, false, manager, allocator)