[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28080] branches/soc-2009-yukishiro/ release/scripts: small merge to 28079.

[Jingyuan Huang]

Revision: 28080
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28080
Author:   yukishiro
Date:     2010-04-07 22:24:08 +0200 (Wed, 07 Apr 2010)

Log Message:
-----------
small merge to 28079.

Modified Paths:
--------------
    branches/soc-2009-yukishiro/release/scripts/ui/properties_texture.py

Property Changed:
----------------
    branches/soc-2009-yukishiro/release/scripts/modules/rigify/neck.py
    branches/soc-2009-yukishiro/release/scripts/modules/rigify/tongue.py


Property changes on: branches/soc-2009-yukishiro/release/scripts/modules/rigify/neck.py
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native


Property changes on: branches/soc-2009-yukishiro/release/scripts/modules/rigify/tongue.py
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/soc-2009-yukishiro/release/scripts/ui/properties_texture.py
===================================================================
--- branches/soc-2009-yukishiro/release/scripts/ui/properties_texture.py	2010-04-07 20:18:37 UTC (rev 28079)
+++ branches/soc-2009-yukishiro/release/scripts/ui/properties_texture.py	2010-04-07 20:24:08 UTC (rev 28080)
@@ -207,7 +207,7 @@
         idblock = context_tex_datablock(context)
         if type(idblock) == bpy.types.Brush and not context.sculpt_object:
             return False
-        return True
+        return context.texture_slot
 
     def draw(self, context):
         layout = self.layout