[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49271] branches/ge_harmony/release/ scripts/startup/bl_ui/properties_game.py: Uniforms prefixed with "bgl_" are now disabled in the UI to avoid conflicts with built in uniforms.

[Daniel Stokes]

Revision: 49271
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49271
Author:   kupoman
Date:     2012-07-26 23:27:36 +0000 (Thu, 26 Jul 2012)
Log Message:
-----------
Uniforms prefixed with "bgl_" are now disabled in the UI to avoid conflicts with built in uniforms.

Modified Paths:
--------------
    branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py

Modified: branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py	2012-07-26 22:47:05 UTC (rev 49270)
+++ branches/ge_harmony/release/scripts/startup/bl_ui/properties_game.py	2012-07-26 23:27:36 UTC (rev 49271)
@@ -387,15 +387,21 @@
                 col.label("Uniforms:")
                 
             for uniform in filter.uniforms:
+                col = layout.column()
                 if hasattr(uniform, "value"):
+                    reserved = uniform.name.startswith("bgl_")
                     if uniform.type in ("VEC2", "VEC3", "VEC4", "IVEC2", "IVEC3", "IVEC4"):
                         col.label(uniform.name + ":")
-                        row = col.row()
-                        row.prop(uniform, "value", text="")
+                        if not reserved:
+                            row = col.row()
+                            row.prop(uniform, "value", text="")
                     else:
                         row = col.row()
                         row.label(uniform.name + ":")
-                        row.prop(uniform, "value", text="")
+                        if not reserved:
+                            row.prop(uniform, "value", text="")
+                        
+                    col.active = not reserved
 
 
 class RENDER_PT_game_shading(RenderButtonsPanel, Panel):