[Bf-blender-cvs] [d8a3a0c] temp_hair_modifiers: Fix for particle modifier type enum callback, was using mesh modifier items.

[Lukas Tönne]

Commit: d8a3a0c6fd01d9c851490947b5dfacf5716a554b
Author: Lukas Tönne
Date:   Tue Feb 3 16:14:25 2015 +0100
Branches: temp_hair_modifiers
https://developer.blender.org/rBd8a3a0c6fd01d9c851490947b5dfacf5716a554b

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;
                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs