[clutter] debug: avoid visualization code during picking



commit d7bf2143973529626ef8781dfa18c7dec8902031
Author: Robert Bragg <robert linux intel com>
Date:   Thu Jun 16 17:22:30 2011 +0100

    debug: avoid visualization code during picking
    
    This makes sure we don't try and draw paint-volumes or culling results
    during a pick cycle since that results in us reading back invalid ids
    from the pick-buffer.

 clutter/clutter-actor.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index bf34d32..b9eb133 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -2905,7 +2905,8 @@ clutter_actor_paint (ClutterActor *self)
 
       success = cull_actor (self, &result);
 
-      if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_REDRAWS))
+      if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_REDRAWS &&
+                      pick_mode == CLUTTER_PICK_NONE))
         _clutter_actor_paint_cull_result (self, success, result);
       else if (result == CLUTTER_CULL_RESULT_OUT && success)
         goto done;
@@ -2927,7 +2928,8 @@ clutter_actor_paint (ClutterActor *self)
       actor_has_shader_data (self))
     clutter_actor_shader_post_paint (self);
 
-  if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_PAINT_VOLUMES))
+  if (G_UNLIKELY (clutter_paint_debug_flags & CLUTTER_DEBUG_PAINT_VOLUMES &&
+                  pick_mode == CLUTTER_PICK_NONE))
     _clutter_actor_draw_paint_volume (self);
 
 done:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]