From b348b392cccd41203853e8362d999ff24c0b3c4d Mon Sep 17 00:00:00 2001
From: Clement Rey <cr.rey.clement@gmail.com>
Date: Wed, 26 Jul 2023 20:06:34 +0200
Subject: [PATCH] self-rebase shenanigans

---
 rerun_py/rerun_sdk/rerun/log/arrow.py         | 2 --
 rerun_py/rerun_sdk/rerun/log/bounding_box.py  | 4 ----
 rerun_py/rerun_sdk/rerun/log/lines.py         | 4 ----
 rerun_py/rerun_sdk/rerun/log/rects.py         | 2 --
 rerun_py/rerun_sdk/rerun/log/text.py          | 2 --
 rerun_py/rerun_sdk/rerun/log/text_internal.py | 2 --
 6 files changed, 16 deletions(-)

diff --git a/rerun_py/rerun_sdk/rerun/log/arrow.py b/rerun_py/rerun_sdk/rerun/log/arrow.py
index 5d23632cf3d1b..865c9ebaf5c10 100644
--- a/rerun_py/rerun_sdk/rerun/log/arrow.py
+++ b/rerun_py/rerun_sdk/rerun/log/arrow.py
@@ -77,8 +77,6 @@ def log_arrow(
         instanced["rerun.arrow3d"] = Arrow3DArray.from_numpy(origin.reshape(1, 3), vector.reshape(1, 3))
 
     if color is not None:
-        from rerun.experimental import cmp as rrc
-
         colors = _normalize_colors(color)
         instanced["rerun.colorrgba"] = rrc.ColorArray.from_similar(colors)
 
diff --git a/rerun_py/rerun_sdk/rerun/log/bounding_box.py b/rerun_py/rerun_sdk/rerun/log/bounding_box.py
index f421c8e95f161..4339d2396c736 100644
--- a/rerun_py/rerun_sdk/rerun/log/bounding_box.py
+++ b/rerun_py/rerun_sdk/rerun/log/bounding_box.py
@@ -113,8 +113,6 @@ def log_obb(
             raise TypeError("rotation should be 1x4")
 
     if color is not None:
-        from rerun.experimental import cmp as rrc
-
         colors = _normalize_colors(color)
         instanced["rerun.colorrgba"] = rrc.ColorArray.from_similar(colors)
 
@@ -238,8 +236,6 @@ def log_obbs(
             raise TypeError("rotation should be 1x4")
 
     if len(colors):
-        from rerun.experimental import cmp as rrc
-
         is_splat = len(colors.shape) == 1
         if is_splat:
             colors = colors.reshape(1, len(colors))
diff --git a/rerun_py/rerun_sdk/rerun/log/lines.py b/rerun_py/rerun_sdk/rerun/log/lines.py
index a7e489b82d330..990c4033065c2 100644
--- a/rerun_py/rerun_sdk/rerun/log/lines.py
+++ b/rerun_py/rerun_sdk/rerun/log/lines.py
@@ -109,8 +109,6 @@ def log_line_strip(
             raise TypeError("Positions should be either Nx2 or Nx3")
 
     if color is not None:
-        from rerun.experimental import cmp as rrc
-
         colors = _normalize_colors(color)
         instanced["rerun.colorrgba"] = rrc.ColorArray.from_similar(colors)
 
@@ -437,8 +435,6 @@ def log_line_segments(
     # The current API splats both color and stroke-width, though the data-model doesn't
     # require that we do so.
     if color is not None:
-        from rerun.experimental import cmp as rrc
-
         colors = _normalize_colors(color)
         splats["rerun.colorrgba"] = rrc.ColorArray.from_similar(colors)
 
diff --git a/rerun_py/rerun_sdk/rerun/log/rects.py b/rerun_py/rerun_sdk/rerun/log/rects.py
index c5c66195a19b4..52082e5fc30d8 100644
--- a/rerun_py/rerun_sdk/rerun/log/rects.py
+++ b/rerun_py/rerun_sdk/rerun/log/rects.py
@@ -85,8 +85,6 @@ def log_rect(
     instanced["rerun.rect2d"] = Rect2DArray.from_numpy_and_format(rects, rect_format)
 
     if color is not None:
-        from rerun.experimental import cmp as rrc
-
         colors = _normalize_colors(color)
         instanced["rerun.colorrgba"] = rrc.ColorArray.from_similar(colors)
 
diff --git a/rerun_py/rerun_sdk/rerun/log/text.py b/rerun_py/rerun_sdk/rerun/log/text.py
index 2fbae21af5ce7..6dfa733bc2404 100644
--- a/rerun_py/rerun_sdk/rerun/log/text.py
+++ b/rerun_py/rerun_sdk/rerun/log/text.py
@@ -118,8 +118,6 @@ def log_text_entry(
         logging.warning(f"Null  text entry in log_text_entry('{entity_path}') will be dropped.")
 
     if color is not None:
-        from rerun.experimental import cmp as rrc
-
         colors = _normalize_colors(color)
         instanced["rerun.colorrgba"] = rrc.ColorArray.from_similar(colors)
 
diff --git a/rerun_py/rerun_sdk/rerun/log/text_internal.py b/rerun_py/rerun_sdk/rerun/log/text_internal.py
index 9987228a3bf14..0efd5ef094126 100644
--- a/rerun_py/rerun_sdk/rerun/log/text_internal.py
+++ b/rerun_py/rerun_sdk/rerun/log/text_internal.py
@@ -94,8 +94,6 @@ def log_text_entry_internal(
         logging.warning(f"Null  text entry in log_text_entry('{entity_path}') will be dropped.")
 
     if color is not None:
-        from rerun.experimental import cmp as rrc
-
         colors = _normalize_colors(color)
         instanced["rerun.colorrgba"] = rrc.ColorArray.from_similar(colors)