Fix merge problems

Author: tedwaine

src/plugin/colour_pipeline/ocio/src/ocio_engine.cpp

@@ -327,7 +327,7 @@ void OCIOEngine::extend_pixel_info(
 OCIO::ConstConfigRcPtr
 OCIOEngine::get_ocio_config(const utility::JsonStore &src_colour_mgmt_metadata) const {
 
-    const std::string config_name =
+    std::string config_name =
         utility::forward_remap_file_path(
             src_colour_mgmt_metadata.get_or("ocio_config", default_config_));
     const std::string displays =
@@ -393,7 +393,7 @@ OCIOEngine::get_ocio_config(const utility::JsonStore &src_colour_mgmt_metadata)
     }
 
     config                     = econfig;
-    ocio_config_cache_[concat] = config;
+    ocio_config_cache_[config_cache_key] = config;
 
     return config;
 }

src/plugin/viewport_overlay/annotations/src/CMakeLists.txt

@@ -29,6 +29,7 @@ target_link_libraries(${PROJECT_NAME}
 		xstudio::plugin_manager
 		xstudio::ui::opengl::viewport
 		Imath::Imath
+		Qt6::Core
 )
 
 set_target_properties(${PROJECT_NAME} PROPERTIES LINK_DEPENDS_NO_SHARED true)

src/plugin/viewport_overlay/annotations/src/annotations_ui_plugin.cpp

@@ -460,7 +460,7 @@ void AnnotationsUI::start_item(const ui::PointerEvent &e) {
     payload["point"]["y"] = float(e.y())/float(e.height());
     payload["viewport"] = e.context();
 
-    const auto colour = std::vector<float>({pen_colour_->value().r, pen_colour_->value().g, pen_colour_->value().b, (current_tool() == Brush ? brush_opacity_->value() : pen_opacity_->value()) / 100.0});
+    const auto colour = std::vector<float>({pen_colour_->value().r, pen_colour_->value().g, pen_colour_->value().b, (current_tool() == Brush ? brush_opacity_->value() : pen_opacity_->value()) / 100.0f});
 
     switch (current_tool()) {
         case Draw:

ui/qml/xstudio/views/viewport/XsViewport.qml

@@ -132,6 +132,8 @@ Viewport {
     // in the ViewportHUD qml code so we create a dummy property here 
     property var hud_plugins_display_data
 
+    property var subPlayheadIdx: viewportPlayhead.keySubplayheadIndex != undefined ? viewportPlayhead.keySubplayheadIndex : 0
+
     // this one lays out the HUD graphics coming from HUD plugins and
     // also general overlay graphics like Mask
     Repeater {
@@ -141,7 +143,7 @@ Viewport {
             // we are in grid mode, it's the index in the model here. If we're not in
             // a grid layout 'num_images_on_screen' is 1 and we need to use the 
             // active sub playhead index.
-            imageIndex: num_images_on_screen == 1 ? viewportPlayhead.keySubplayheadIndex : index
+            imageIndex: num_images_on_screen == 1 ? subPlayheadIdx : index
         }
     }