Browse Source

Move texture page setting to World panel

This makes sense because the pages to export checkboxes are here. The
export modal should be sort of a "last-chance" settings thing... not
actual core settings.
pull/10/head
Adam Johnson 9 years ago
parent
commit
a838d82c00
  1. 2
      korman/exporter/convert.py
  2. 5
      korman/operators/op_export.py
  3. 3
      korman/properties/prop_world.py
  4. 1
      korman/ui/ui_world.py

2
korman/exporter/convert.py

@ -127,7 +127,7 @@ class Exporter:
for page in age_info.pages: for page in age_info.pages:
if page.enabled: if page.enabled:
mgr.create_page(age_name, page.name, page.seq_suffix) mgr.create_page(age_name, page.name, page.seq_suffix)
mgr.create_builtins(age_name, self._op.use_texture_page) mgr.create_builtins(age_name, age_info.use_texture_page)
def _export_actor(self, so, bo): def _export_actor(self, so, bo):
"""Exports a Coordinate Interface if we need one""" """Exports a Coordinate Interface if we need one"""

5
korman/operators/op_export.py

@ -47,10 +47,6 @@ class ExportOperator(bpy.types.Operator):
"items": [("pvPrime", "Ages Beyond Myst (63.11)", "Targets the original Uru (Live) game", 2), "items": [("pvPrime", "Ages Beyond Myst (63.11)", "Targets the original Uru (Live) game", 2),
("pvPots", "Path of the Shell (63.12)", "Targets the most recent offline expansion pack", 1), ("pvPots", "Path of the Shell (63.12)", "Targets the most recent offline expansion pack", 1),
("pvMoul", "Myst Online: Uru Live (70)", "Targets the most recent online game", 0)]}), ("pvMoul", "Myst Online: Uru Live (70)", "Targets the most recent online game", 0)]}),
"use_texture_page": (BoolProperty, {"name": "Use Textures Page",
"description": "Exports all textures to a dedicated Textures page",
"default": True}),
} }
# This wigs out and very bad things happen if it's not directly on the operator... # This wigs out and very bad things happen if it's not directly on the operator...
@ -63,7 +59,6 @@ class ExportOperator(bpy.types.Operator):
# The crazy mess we're doing with props on the fly means we have to explicitly draw them :( # The crazy mess we're doing with props on the fly means we have to explicitly draw them :(
layout.prop(age, "version") layout.prop(age, "version")
layout.prop(age, "regenerate_lightmaps") layout.prop(age, "regenerate_lightmaps")
layout.prop(age, "use_texture_page")
layout.prop(age, "profile_export") layout.prop(age, "profile_export")
def __getattr__(self, attr): def __getattr__(self, attr):

3
korman/properties/prop_world.py

@ -155,6 +155,9 @@ class PlasmaAge(bpy.types.PropertyGroup):
age_sdl = BoolProperty(name="Age Global SDL", age_sdl = BoolProperty(name="Age Global SDL",
description="This age has its own SDL file", description="This age has its own SDL file",
default=False) default=False)
use_texture_page = BoolProperty(name="Use Textures Page",
description="Exports all textures to a dedicated Textures page",
default=True)
# Implementation details # Implementation details
active_page_index = IntProperty(name="Active Page Index") active_page_index = IntProperty(name="Active Page Index")

1
korman/ui/ui_world.py

@ -78,6 +78,7 @@ class PlasmaAgePanel(AgeButtonsPanel, bpy.types.Panel):
col.label("Age Settings:") col.label("Age Settings:")
col.prop(age, "seq_prefix", text="ID") col.prop(age, "seq_prefix", text="ID")
col.prop(age, "age_sdl") col.prop(age, "age_sdl")
col.prop(age, "use_texture_page")
class PlasmaEnvironmentPanel(AgeButtonsPanel, bpy.types.Panel): class PlasmaEnvironmentPanel(AgeButtonsPanel, bpy.types.Panel):

Loading…
Cancel
Save