Merge origin/master into codex/rpg-creation-cg-fix
This commit is contained in:
@@ -1293,6 +1293,12 @@ fn select_puzzle_cover_image_tx(
|
||||
ui_background_prompt: target_level.ui_background_prompt,
|
||||
ui_background_image_src: target_level.ui_background_image_src,
|
||||
ui_background_image_object_key: target_level.ui_background_image_object_key,
|
||||
level_scene_image_src: target_level.level_scene_image_src,
|
||||
level_scene_image_object_key: target_level.level_scene_image_object_key,
|
||||
ui_spritesheet_image_src: target_level.ui_spritesheet_image_src,
|
||||
ui_spritesheet_image_object_key: target_level.ui_spritesheet_image_object_key,
|
||||
level_background_image_src: target_level.level_background_image_src,
|
||||
level_background_image_object_key: target_level.level_background_image_object_key,
|
||||
background_music: target_level.background_music,
|
||||
candidates: selected_level_draft.candidates,
|
||||
selected_candidate_id: selected_level_draft.selected_candidate_id,
|
||||
@@ -2636,6 +2642,12 @@ fn build_profile_levels_from_row(
|
||||
ui_background_prompt: None,
|
||||
ui_background_image_src: None,
|
||||
ui_background_image_object_key: None,
|
||||
level_scene_image_src: None,
|
||||
level_scene_image_object_key: None,
|
||||
ui_spritesheet_image_src: None,
|
||||
ui_spritesheet_image_object_key: None,
|
||||
level_background_image_src: None,
|
||||
level_background_image_object_key: None,
|
||||
background_music: None,
|
||||
candidates: Vec::new(),
|
||||
selected_candidate_id: None,
|
||||
|
||||
Reference in New Issue
Block a user