[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31512] trunk/blender/release/scripts/ui: Fix python errors in particles render panel and rigid body joint constraint .

[Brecht Van Lommel]

Revision: 31512
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31512
Author:   blendix
Date:     2010-08-22 11:18:26 +0200 (Sun, 22 Aug 2010)

Log Message:
-----------
Fix python errors in particles render panel and rigid body joint constraint.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_object_constraint.py
    trunk/blender/release/scripts/ui/properties_particle.py

Modified: trunk/blender/release/scripts/ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object_constraint.py	2010-08-22 07:11:40 UTC (rev 31511)
+++ trunk/blender/release/scripts/ui/properties_object_constraint.py	2010-08-22 09:18:26 UTC (rev 31512)
@@ -524,7 +524,7 @@
         self.space_template(layout, con)
 
     def RIGID_BODY_JOINT(self, context, layout, con):
-        self.target_template(layout, con)
+        self.target_template(layout, con, subtargets=False)
 
         layout.prop(con, "pivot_type")
         layout.prop(con, "child")

Modified: trunk/blender/release/scripts/ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_particle.py	2010-08-22 07:11:40 UTC (rev 31511)
+++ trunk/blender/release/scripts/ui/properties_particle.py	2010-08-22 09:18:26 UTC (rev 31512)
@@ -713,10 +713,10 @@
             subsub.active = (part.use_strand_primitive is False)
             subsub.prop(part, "use_render_adaptive")
             subsub = sub.column()
-            subsub.active = part.render_adaptive or part.use_strand_primitive == True
+            subsub.active = part.use_render_adaptive or part.use_strand_primitive == True
             subsub.prop(part, "adaptive_angle")
             subsub = sub.column()
-            subsub.active = (part.render_adaptive is True and part.use_strand_primitive is False)
+            subsub.active = (part.use_render_adaptive is True and part.use_strand_primitive is False)
             subsub.prop(part, "adaptive_pixel")
             sub.prop(part, "use_hair_bspline")
             sub.prop(part, "render_step", text="Steps")