[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42755] trunk/blender/release/scripts/ startup/bl_ui/properties_particle.py: First fix after Cucumber merge starts .

Thomas Dinges blender at dingto.org
Tue Dec 20 07:26:12 CET 2011


Revision: 42755
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42755
Author:   dingto
Date:     2011-12-20 06:26:03 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
First fix after Cucumber merge starts.
* Restore COMPAT_ENGINES for particle panel, caused error on startup. (Cycles needs it) 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_particle.py

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_particle.py	2011-12-20 05:48:35 UTC (rev 42754)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_particle.py	2011-12-20 06:26:03 UTC (rev 42755)
@@ -76,12 +76,12 @@
 class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel):
     bl_label = ""
     bl_options = {'HIDE_HEADER'}
-    # COMPAT_ENGINES = {'BLENDER_RENDER'}
+    COMPAT_ENGINES = {'BLENDER_RENDER'}
 
     @classmethod
     def poll(cls, context):
         engine = context.scene.render.engine
-        return (context.particle_system or context.object or context.space_data.pin_id)# and (engine in cls.COMPAT_ENGINES)
+        return (context.particle_system or context.object or context.space_data.pin_id) and (engine in cls.COMPAT_ENGINES)
 
     def draw(self, context):
         layout = self.layout




More information about the Bf-blender-cvs mailing list