Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease

This commit is contained in:
stiffly
2016-03-13 22:22:41 +01:00
7 changed files with 81 additions and 48 deletions
+5
View File
@@ -76,6 +76,11 @@ void PickingPass::Draw(RenderScene& scene)
auto modelJob = std::dynamic_pointer_cast<ModelJob>(job);
if (modelJob) {
if(modelJob->NotPickable) {
continue;
}
int pickColor[2] = { m_ColorCounter[0], m_ColorCounter[1] };
PickingInfo pickInfo;