[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31201] branches/soc-2010-nicolasbishop/ release/scripts/ui: Fixed some python merge errors in my branch.

Nicholas Bishop nicholasbishop at gmail.com
Mon Aug 9 23:54:17 CEST 2010


Revision: 31201
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31201
Author:   nicholasbishop
Date:     2010-08-09 23:54:17 +0200 (Mon, 09 Aug 2010)

Log Message:
-----------
Fixed some python merge errors in my branch.

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_mesh.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py

Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_mesh.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_mesh.py	2010-08-09 21:48:13 UTC (rev 31200)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_mesh.py	2010-08-09 21:54:17 UTC (rev 31201)
@@ -355,7 +355,7 @@
                 layout.operator("mesh.vertex_color_multiresolution_toggle", text="Add Multires")
 
 
-class DATA_PT_ptex(DataButtonsPanel, bpy.types.Panel):
+class DATA_PT_ptex(MeshButtonsPanel, bpy.types.Panel):
     bl_label = "PTex"
     COMPAT_ENGINES = {'BLENDER_RENDER'}
 

Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py	2010-08-09 21:48:13 UTC (rev 31200)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py	2010-08-09 21:54:17 UTC (rev 31201)
@@ -494,7 +494,8 @@
     bl_label = "Masking"
     bl_default_closed = False
 
-    def poll(context):
+    @classmethod
+    def poll(cls, context):
         return context.sculpt_object or context.vertex_paint_object
 
     def draw(self, context):
@@ -1390,9 +1391,11 @@
     bl_label = "Source Image"
     bl_default_closed = True
 
-    def poll(context):
-        #return (context.vertex_paint_object or context.texture_paint_object)
-        return (context.vertex_paint_object)
+    @classmethod
+    def poll(cls, context):
+        settings = cls.paint_settings(context)
+        #return context.vertex_paint_object or context.texture_paint_object
+        return context.vertex_paint_object
 
     def draw(self, context):
         layout = self.layout





More information about the Bf-blender-cvs mailing list