merged changes to revision 24077
[blender-staging.git] / source / blender / python / intern / bpy_interface.c
index 3f81a9b95559b1f4d21618333b4cbc33136c3082..51bccfb408751332cd7e8b9ce5c41022a61ed2b3 100644 (file)
@@ -887,7 +887,7 @@ float BPY_pydriver_eval (ChannelDriver *driver)
 int BPY_button_eval(bContext *C, char *expr, double *value)
 {
        PyGILState_STATE gilstate;
-       PyObject *dict, *retval;
+       PyObject *dict, *mod, *retval;
        int error_ret = 0;
        
        if (!value || !expr || expr[0]=='\0') return -1;
@@ -895,6 +895,20 @@ int BPY_button_eval(bContext *C, char *expr, double *value)
        bpy_context_set(C, &gilstate);
        
        dict= CreateGlobalDictionary(C);
+       
+       /* import some modules: builtins,math*/
+       PyDict_SetItemString(dict, "__builtins__", PyEval_GetBuiltins());
+
+       mod = PyImport_ImportModule("math");
+       if (mod) {
+               PyDict_Merge(dict, PyModule_GetDict(mod), 0); /* 0 - dont overwrite existing values */
+               
+               /* Only keep for backwards compat! - just import all math into root, they are standard */
+               PyDict_SetItemString(dict, "math", mod);
+               PyDict_SetItemString(dict, "m", mod);
+               Py_DECREF(mod);
+       } 
+       
        retval = PyRun_String(expr, Py_eval_input, dict, dict);
        
        if (retval == NULL) {