diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-21 06:51:56 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-21 06:51:56 +0400 |
| commit | 1be67b60fd08f640b56db23e08ad0469318f26b3 (patch) | |
| tree | 4f262c2f9ca66cfeec5fecb2be1a313ed357e057 /source/blender/blenkernel | |
| parent | 2881393fbb42cca81ee4d36895fc248a22c54823 (diff) | |
2.5: Modifiers & Menus
* Popup menus now remember the last clicked item again.
* Modifier and File Format menus are now organized in multiple
columns with categories.
* Hook, explode, uv project modifiers have all their buttons
again with the relevant operators implemented.
* Modifiers that can't be added by the user, or don't work on
curves for example, are not in the menu anymore.
* Fix search menu overlapping buttons when near the bottom of
the screen.
* Fix uv layers search menu not working in some modifiers.
* Cleanup popup menu code a bit, layout engine is used in more
cases now instead of ugly position calculation code.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 5 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index b65d77751e2..27c75126026 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -90,7 +90,10 @@ typedef enum { eModifierTypeFlag_UsesPointCache = (1<<6), /* For physics modifiers, max one per type */ - eModifierTypeFlag_Single = (1<<7) + eModifierTypeFlag_Single = (1<<7), + + /* Some modifier can't be added manually by user */ + eModifierTypeFlag_NoUserAdd = (1<<8) } ModifierTypeFlag; typedef void (*ObjectWalkFunc)(void *userData, struct Object *ob, struct Object **obpoin); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 4d567245ce1..37cf427b897 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -8616,7 +8616,8 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type) mti->freeData = smokeHRModifier_freeData; mti->flags = eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_UsesPointCache - | eModifierTypeFlag_Single; + | eModifierTypeFlag_Single + | eModifierTypeFlag_NoUserAdd; mti->deformVerts = smokeHRModifier_deformVerts; mti->dependsOnTime = smokeHRModifier_dependsOnTime; mti->updateDepgraph = smokeHRModifier_updateDepgraph; @@ -8647,7 +8648,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type) mti = INIT_TYPE(Surface); mti->type = eModifierTypeType_OnlyDeform; mti->initData = surfaceModifier_initData; - mti->flags = eModifierTypeFlag_AcceptsMesh; + mti->flags = eModifierTypeFlag_AcceptsMesh|eModifierTypeFlag_NoUserAdd; mti->dependsOnTime = surfaceModifier_dependsOnTime; mti->freeData = surfaceModifier_freeData; mti->deformVerts = surfaceModifier_deformVerts; |