[Bf-blender-cvs] [a977cb04455] master: Cleanup: use single quotes for enum values
Campbell Barton
noreply at git.blender.org
Tue Dec 17 04:08:18 CET 2019
Commit: a977cb04455c4987711052f9abea04065c618427
Author: Campbell Barton
Date: Tue Dec 17 12:55:56 2019 +1100
Branches: master
https://developer.blender.org/rBa977cb04455c4987711052f9abea04065c618427
Cleanup: use single quotes for enum values
===================================================================
M release/scripts/startup/bl_ui/properties_physics_fluid.py
M release/scripts/startup/bl_ui/space_outliner.py
M release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 6d87d442dc3..1eec2ac0ce7 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -134,7 +134,7 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel):
domain = md.domain_settings
# Deactivate UI if guiding is enabled but not baked yet
- layout.active = not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == "EFFECTOR" or (domain.guiding_source == "DOMAIN" and not domain.guiding_parent)))
+ layout.active = not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise or domain.cache_baking_guiding
baked_data = domain.cache_baked_data
@@ -170,7 +170,7 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel):
# TODO (sebbas): Clipping var useful for manta openvdb caching?
# col.prop(domain, "clipping", text="Empty Space")
- if domain.cache_type == "MODULAR":
+ if domain.cache_type == 'MODULAR':
col.separator()
split = layout.split()
@@ -234,7 +234,7 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel):
col.prop(effec, "use_plane_init", text="Is Planar")
col.prop(effec, "surface_distance", text="Surface Thickness")
- if effec.effec_type == "GUIDE":
+ if effec.effec_type == 'GUIDE':
col.prop(effec, "velocity_factor", text="Velocity Factor")
col = flow.column()
col.prop(effec, "guiding_mode", text="Guiding Mode")
@@ -642,7 +642,7 @@ class PHYSICS_PT_noise(PhysicButtonsPanel, Panel):
domain = context.fluid.domain_settings
# Deactivate UI if guiding is enabled but not baked yet
- layout.active = domain.use_noise and not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == "EFFECTOR" or (domain.guiding_source == "DOMAIN" and not domain.guiding_parent)))
+ layout.active = domain.use_noise and not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise or domain.cache_baking_guiding
baked_noise = domain.cache_baked_noise
@@ -660,7 +660,7 @@ class PHYSICS_PT_noise(PhysicButtonsPanel, Panel):
col.prop(domain, "noise_pos_scale", text="Scale")
col.prop(domain, "noise_time_anim", text="Time")
- if domain.cache_type == "MODULAR":
+ if domain.cache_type == 'MODULAR':
col.separator()
split = layout.split()
@@ -708,7 +708,7 @@ class PHYSICS_PT_mesh(PhysicButtonsPanel, Panel):
domain = context.fluid.domain_settings
# Deactivate UI if guiding is enabled but not baked yet
- layout.active = domain.use_mesh and not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == "EFFECTOR" or (domain.guiding_source == "DOMAIN" and not domain.guiding_parent)))
+ layout.active = domain.use_mesh and not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise or domain.cache_baking_guiding
baked_mesh = domain.cache_baked_mesh
@@ -739,7 +739,7 @@ class PHYSICS_PT_mesh(PhysicButtonsPanel, Panel):
# TODO (sebbas): for now just interpolate any upres grids, ie not sampling highres grids
#col.prop(domain, "highres_sampling", text="Flow Sampling:")
- if domain.cache_type == "MODULAR":
+ if domain.cache_type == 'MODULAR':
col.separator()
split = layout.split()
@@ -780,7 +780,7 @@ class PHYSICS_PT_particles(PhysicButtonsPanel, Panel):
domain = context.fluid.domain_settings
# Deactivate UI if guiding is enabled but not baked yet
- layout.active = not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == "EFFECTOR" or (domain.guiding_source == "DOMAIN" and not domain.guiding_parent)))
+ layout.active = not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise or domain.cache_baking_guiding
baked_particles = domain.cache_baked_particles
@@ -845,7 +845,7 @@ class PHYSICS_PT_particles(PhysicButtonsPanel, Panel):
col = flow.column()
col.prop(domain, "sndparticle_boundary", text="Particles in Boundary:")
- if domain.cache_type == "MODULAR":
+ if domain.cache_type == 'MODULAR':
col.separator()
split = layout.split()
@@ -887,7 +887,7 @@ class PHYSICS_PT_diffusion(PhysicButtonsPanel, Panel):
domain = context.fluid.domain_settings
# Deactivate UI if guiding is enabled but not baked yet
- layout.active = not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == "EFFECTOR" or (domain.guiding_source == "DOMAIN" and not domain.guiding_parent)))
+ layout.active = not (domain.use_guiding and not domain.cache_baked_guiding and (domain.guiding_source == 'EFFECTOR' or (domain.guiding_source == 'DOMAIN' and not domain.guiding_parent)))
baking_any = domain.cache_baking_data or domain.cache_baking_mesh or domain.cache_baking_particles or domain.cache_baking_noise or domain.cache_baking_guiding
baked_any = domain.cache_baked_data or domain.cache_baked_mesh or domain.cache_baked_particles or domain.cache_baked_noise or domain.cache_baked_guiding
@@ -956,13 +956,13 @@ class PHYSICS_PT_guiding(PhysicButtonsPanel, Panel):
col = flow.column()
col.prop(domain, "guiding_source", text="Velocity Source")
- if domain.guiding_source == "DOMAIN":
+ if domain.guiding_source == 'DOMAIN':
col.prop(domain, "guiding_parent", text="Guiding Parent")
- if domain.cache_type == "MODULAR":
+ if domain.cache_type == 'MODULAR':
col.separator()
- if domain.guiding_source == "EFFECTOR":
+ if domain.guiding_source == 'EFFECTOR':
split = layout.split()
bake_incomplete = (domain.cache_frame_pause_guiding < domain.cache_frame_end)
if domain.cache_baked_guiding and not domain.cache_baking_guiding and bake_incomplete:
@@ -1063,7 +1063,7 @@ class PHYSICS_PT_cache(PhysicButtonsPanel, Panel):
if domain.use_mesh:
col.prop(domain, "cache_mesh_format", text="Mesh File Format")
- if domain.cache_type == "FINAL":
+ if domain.cache_type == 'FINAL':
col.separator()
split = layout.split()
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 7bf203d8e39..11fb20d8b38 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -48,7 +48,7 @@ class OUTLINER_HT_header(Header):
if display_mode == 'SEQUENCE':
row = layout.row(align=True)
- row.prop(space, "use_sync_select", icon="UV_SYNC_SELECT", text="")
+ row.prop(space, "use_sync_select", icon='UV_SYNC_SELECT', text="")
row = layout.row(align=True)
if display_mode in {'SCENES', 'VIEW_LAYER'}:
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index b4f841d2eb8..097564444d0 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -510,7 +510,7 @@ class SEQUENCER_MT_add(Menu):
col.enabled = selected_sequences_len(context) >= 2
col = layout.column()
- col.operator_menu_enum("sequencer.fades_add", "type", text="Fade", icon="IPO_EASE_IN_OUT")
+ col.operator_menu_enum("sequencer.fades_add", "type", text="Fade", icon='IPO_EASE_IN_OUT')
col.enabled = selected_sequences_len(context) >= 1
More information about the Bf-blender-cvs
mailing list