Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_texture.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_texture.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index 78ea4fa6c3f..5a4937d2509 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -1147,6 +1147,7 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
factor_but(col, "use_map_life", "life_factor", "Lifetime")
factor_but(col, "use_map_density", "density_factor", "Density")
factor_but(col, "use_map_size", "size_factor", "Size")
+ factor_but(col, "use_map_particle_color", "particle_color_factor", "Color")
col = split.column()
col.label(text="Physics:")
@@ -1168,6 +1169,9 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
factor_but(col, "use_map_kink_freq", "kink_freq_factor", "Kink Frequency")
factor_but(col, "use_map_rough", "rough_factor", "Rough")
+ sub = factor_but(layout, "use_map_shapekey", "shapekey_factor", "Shape Key")
+ sub.prop(tex, "shapekey", text="")
+
elif isinstance(idblock, FreestyleLineStyle):
split = layout.split()
@@ -1178,7 +1182,8 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel):
layout.separator()
- if not isinstance(idblock, ParticleSettings):
+ show_blend_settings = (not isinstance(idblock, ParticleSettings)) or tex.use_map_particle_color
+ if show_blend_settings:
split = layout.split()
col = split.column()