Skip to content

Commit

Permalink
Last minute UI change and update of the updater's date
Browse files Browse the repository at this point in the history
  • Loading branch information
tngreene committed Jun 22, 2020
1 parent 409dcff commit f33e4bc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion io_xplane2blender/xplane_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# The current data model version, incrementing every time xplane_constants, xplane_props, or xplane_updater
# changes. Builds earlier than 3.4.0-beta.5 have and a version of 0.
# When merging, take the higher data model version of the two branches and add one
CURRENT_DATA_MODEL_VERSION = 87
CURRENT_DATA_MODEL_VERSION = 88

# The build number, hardcoded by the build script when there is one, otherwise it is xplane_constants.BUILD_NUMBER_NONE
CURRENT_BUILD_NUMBER = xplane_constants.BUILD_NUMBER_NONE
Expand Down
2 changes: 1 addition & 1 deletion io_xplane2blender/xplane_props.py
Original file line number Diff line number Diff line change
Expand Up @@ -1725,7 +1725,7 @@ class XPlaneLightSettings(bpy.types.PropertyGroup):
)

param_size: bpy.props.FloatProperty(
name = "Size",
name = "Light Size",
description = "Spill size uses meters; billboard size uses arbitrary scales - bigger is brighter",
default = 1.0,
min = LIGHT_PARAM_SIZE_MIN,
Expand Down
4 changes: 2 additions & 2 deletions io_xplane2blender/xplane_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -559,9 +559,9 @@ def draw_automatic_ui():
layout.row().label(text=f"Use a different light or switch X-Plane Light Type to Named or Manual Param")
# To understand why this all works, see the massive comment in xplane_lights_txt_parser.py
elif is_omni and light_data.type == "SPOT":
layout.row().label(text=f"'{light_data.xplane.name}' will be omnidirectional in X-Plane, use a Point Light")
layout.row().label(text=f"'{light_data.xplane.name}' is omnidirectional and must use a Point Light")
elif not is_omni and omni_conclusively_known and light_data.type == "POINT":
layout.row().label(text=f"'{light_data.xplane.name}' will be directional in X-Plane, use a Spot Light")
layout.row().label(text=f"'{light_data.xplane.name}' is directional and must use a Spot Light")
elif parsed_light.light_param_def:
for param, prop_name in {
"INDEX": "param_index",
Expand Down
2 changes: 1 addition & 1 deletion io_xplane2blender/xplane_updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ def update(last_version:xplane_helpers.VerStruct, logger:xplane_helpers.XPlaneLo
xplane_updater_helpers.delete_property_from_datablock(has_layer.xplane.layer, "export")
#----------------------------------------------------------------------

if last_version < xplane_helpers.VerStruct.parse_version("4.0.0-beta.2+81.20200421111500"):
if last_version < xplane_helpers.VerStruct.parse_version("4.0.0-beta.2+88.20200622133200"):
# Remember, get returning 0 and return None means something different
for light in filter(lambda l: l.xplane.get("type") is None, bpy.data.lights):
light.xplane.type = xplane_constants.LIGHT_DEFAULT
Expand Down

0 comments on commit f33e4bc

Please sign in to comment.