[Bf-blender-cvs] [6b87c48] temp_hair_modifiers: Fix for particle modifier type enum callback, was using mesh modifier items.
Lukas Tönne
noreply at git.blender.org
Mon Feb 9 14:25:39 CET 2015
Commit: 6b87c48db73ef368dfe8d070c7eac7524d1665bd
Author: Lukas Tönne
Date: Tue Feb 3 16:14:25 2015 +0100
Branches: temp_hair_modifiers
https://developer.blender.org/rB6b87c48db73ef368dfe8d070c7eac7524d1665bd
Fix for particle modifier type enum callback, was using mesh modifier
items.
===================================================================
M source/blender/editors/physics/particle_modifier.c
===================================================================
diff --git a/source/blender/editors/physics/particle_modifier.c b/source/blender/editors/physics/particle_modifier.c
index f79869e..83a331a 100644
--- a/source/blender/editors/physics/particle_modifier.c
+++ b/source/blender/editors/physics/particle_modifier.c
@@ -194,29 +194,19 @@ static int particle_modifier_add_exec(bContext *C, wmOperator *op)
static EnumPropertyItem *particle_modifier_add_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
{
Object *ob = ED_object_active_context(C);
+ ParticleSystem *psys = psys_get_current(ob);
EnumPropertyItem *item = NULL, *md_item, *group_item = NULL;
- ModifierTypeInfo *mti;
int totitem = 0, a;
- if (!ob)
+ if (!ob || !psys)
return particle_modifier_type_items;
- for (a = 0; modifier_type_items[a].identifier; a++) {
- md_item = &modifier_type_items[a];
-
- if (md_item->identifier[0]) {
- mti = modifierType_getInfo(md_item->value);
-
- if (mti->flags & eModifierTypeFlag_NoUserAdd)
- continue;
+ for (a = 0; particle_modifier_type_items[a].identifier; a++) {
+ md_item = &particle_modifier_type_items[a];
- if (!BKE_object_support_modifier_type_check(ob, md_item->value))
- continue;
- }
- else {
+ if (!md_item->identifier[0]) {
group_item = md_item;
md_item = NULL;
-
continue;
}
More information about the Bf-blender-cvs
mailing list