missed some files last commit.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jan 2010 19:21:15 +0000 (19:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jan 2010 19:21:15 +0000 (19:21 +0000)
release/scripts/modules/bpy/utils.py
source/blender/makesrna/intern/rna_scene.c

index 55116281d0a6a8578f9d6a59a9a91ce828748554..383d2be0780d9467c5adfb821f15e8da36c814fe 100644 (file)
@@ -60,8 +60,8 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
 
     if reload_scripts:
         # reload modules that may not be directly included
-        for type_class_name in dir(types):
-            type_class = getattr(types, type_class_name)
+        for type_class_name in dir(_bpy.types):
+            type_class = getattr(_bpy.types, type_class_name)
             module_name = getattr(type_class, "__module__", "")
 
             if module_name and module_name != "bpy.types": # hard coded for C types
index cffe08d932860102f472199e80b4bf35c7add822..a1e1559fb134e165f42dbc08581afe2e289da709 100644 (file)
@@ -49,6 +49,7 @@
 
 #include "WM_types.h"
 
+#include "BLI_threads.h"
 
 EnumPropertyItem snap_target_items[] = {
        {SCE_SNAP_TARGET_CLOSEST, "CLOSEST", 0, "Closest", "Snap closest point onto target."},