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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-26 14:15:45 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-26 14:15:45 +0300
commit5fe3524ab162cf6f9080653fc5f2c1a1384f2c64 (patch)
tree87c1f40845bbd8c4818df5a99d080bee036a16a2 /source/blender/editors/interface/interface_templates.c
parent50e324c5d0f55f92615d083d8f0d999b191f2a75 (diff)
Fix #20803: convert button in particle modifier didn't work
for creating duplis yet.
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
-rw-r--r--source/blender/editors/interface/interface_templates.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index f9c27c8572f..a90ddd991ca 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -797,8 +797,10 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
if (md->type==eModifierType_ParticleSystem) {
ParticleSystem *psys= ((ParticleSystemModifierData *)md)->psys;
- if (!(ob->mode & OB_MODE_PARTICLE_EDIT)) {
- if(ELEM3(psys->part->ren_as, PART_DRAW_PATH, PART_DRAW_GR, PART_DRAW_OB) && psys->pathcache)
+ if (!(ob->mode & OB_MODE_PARTICLE_EDIT) && psys->pathcache) {
+ if(ELEM(psys->part->ren_as, PART_DRAW_GR, PART_DRAW_OB))
+ uiItemO(row, "Convert", 0, "OBJECT_OT_duplicates_make_real");
+ else if(psys->part->ren_as == PART_DRAW_PATH)
uiItemO(row, "Convert", 0, "OBJECT_OT_modifier_convert");
}
}