Merge branch 'refs/heads/ninja-internal' into WebGLFixes

Conflicts:
	js/helper-classes/RDGE/GLMaterial.js
	js/helper-classes/RDGE/GLRectangle.js
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/Materials/FlatMaterial.js
	js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js
	js/helper-classes/RDGE/Materials/JuliaMaterial.js
	js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js
	js/helper-classes/RDGE/Materials/MandelMaterial.js
	js/helper-classes/RDGE/Materials/PlasmaMaterial.js
	js/helper-classes/RDGE/Materials/PulseMaterial.js
	js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
	js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
	js/helper-classes/RDGE/Materials/TunnelMaterial.js
	js/helper-classes/RDGE/Materials/TwistMaterial.js
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/src/core/script/renderer.js
	js/panels/Materials/Materials.xml

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index 21ada556..ccac99ca 100644
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -563,7 +563,7 @@ span.pp-span-all:focus {
 #pp-container-list span.span-space {
     background-repeat: no-repeat;
 }
-#pp-container-list li.directory.open > span.pp-span-all > span.pp-col-files > span.span-space {
+#pp-container-list li.directory.open > span.pp-span-all > span.pp-col-files > span.span-space, .branch-label {
     background-image:url("../images/panels/project-panel/icon-file-folderopen.png");
     background-position: 100% 0px;
 }