2.5: small tweaks for scene and object layouts.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 14 Jul 2009 20:38:21 +0000 (20:38 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 14 Jul 2009 20:38:21 +0000 (20:38 +0000)
release/ui/buttons_objects.py
release/ui/buttons_scene.py

index 47c127adeae5aaaefdbc6e556068f6d2b6e59546..9261da6cc9e21c4d712e3394dccb01eebe12de49 100644 (file)
@@ -149,11 +149,17 @@ class OBJECT_PT_animation(ObjectButtonsPanel):
                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="")
index 55578c44cee969bae9e489043d6ff94dd7656bcc..90de34116a6dac2bfa3dbc8e1198f4629ec719a0 100644 (file)
@@ -117,9 +117,6 @@ class RENDER_PT_shading(RenderButtonsPanel):
                
                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 @@ class RENDER_PT_performance(RenderButtonsPanel):
                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