[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21585] branches/blender2.5/blender/ release/ui: 2.5: small tweaks for scene and object layouts.

[Brecht Van Lommel]

Revision: 21585
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21585
Author:   blendix
Date:     2009-07-14 22:38:21 +0200 (Tue, 14 Jul 2009)

Log Message:
-----------
2.5: small tweaks for scene and object layouts.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_objects.py
    branches/blender2.5/blender/release/ui/buttons_scene.py

Modified: branches/blender2.5/blender/release/ui/buttons_objects.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_objects.py	2009-07-14 20:27:28 UTC (rev 21584)
+++ branches/blender2.5/blender/release/ui/buttons_objects.py	2009-07-14 20:38:21 UTC (rev 21585)
@@ -149,11 +149,17 @@
 		sub = split.column()
 		sub.itemL(text="Time Offset:")
 		sub.itemR(ob, "time_offset_edit", text="Edit")
-		sub.itemR(ob, "time_offset_particle", text="Particle")
-		sub.itemR(ob, "time_offset_parent", text="Parent")
-		sub.itemR(ob, "slow_parent")
+		row = sub.row()
+		row.itemR(ob, "time_offset_particle", text="Particle")
+		row.active = len(ob.particle_systems) != 0
+		row = sub.row()
+		row.itemR(ob, "time_offset_parent", text="Parent")
+		row.active = ob.parent != None
+		row = sub.row()
+		row.itemR(ob, "slow_parent")
+		row.active = ob.parent != None
 		sub.itemR(ob, "time_offset", text="Offset")
-		
+
 		sub = split.column()
 		sub.itemL(text="Tracking:")
 		sub.itemR(ob, "track", text="")

Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py	2009-07-14 20:27:28 UTC (rev 21584)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py	2009-07-14 20:38:21 UTC (rev 21585)
@@ -117,9 +117,6 @@
 		
 		col = split.column()
 		col.itemR(rd, "render_raytracing", text="Ray Tracing")
-		row = col.row()
-		row.active = rd.render_raytracing
-		row.itemR(rd, "octree_resolution", text="Octree")
 		col.itemR(rd, "alpha_mode", text="Alpha")
 
 class RENDER_PT_performance(RenderButtonsPanel):
@@ -159,6 +156,11 @@
 		col.itemR(rd, "free_image_textures")
 		col.active = rd.use_compositing
 
+		row = layout.row()
+		row.active = rd.render_raytracing
+		row.itemR(rd, "octree_resolution", text="Ray Tracing Octree")
+
+
 class RENDER_PT_post_processing(RenderButtonsPanel):
 	__label__ = "Post Processing"
 	__default_closed__ = True