Commit: 1740fedb644007fadea2efd1cc5b23dffff8d234
Author: Sergey Sharybin
Date: Tue Mar 31 00:27:22 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB1740fedb644007fadea2efd1cc5b23dffff8d234
Merge branch 'master' into gooseberry
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/modifier.c
index 2433e4d,1f6d40d..4d007e1
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@@ -100,15 -99,13 +100,15 @@@ void BKE_modifier_init(void
virtualModifierCommonData.cmd.modifier.mode |= eModifierMode_Virtual;
virtualModifierCommonData.lmd.modifier.mode |= eModifierMode_Virtual;
virtualModifierCommonData.smd.modifier.mode |= eModifierMode_Virtual;
+
+ BKE_cache_modifier_init();
}
- ModifierTypeInfo *modifierType_getInfo(ModifierType type)
+ const ModifierTypeInfo *modifierType_getInfo(ModifierType type)
{
/* type unsigned, no need to check < 0 */
- if (type < NUM_MODIFIER_TYPES && modifier_types[type]->name[0] != '\0')
{
- return modifier_types[type];
+ if (type < NUM_MODIFIER_TYPES && cache_modifier_types[type]->name[0] !=
'\0') {
+ return cache_modifier_types[type];
}
else {
return NULL;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
