diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f6e8f88fd9..ae39f7ce5b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,7 +129,7 @@ option(WITH_BUILDINFO "Include extra build details (only disable for develop option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON) option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF) option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) -option(WITH_GAMEENGINE "Enable Game Engine" OFF) # DISABLE FOR BMESH UNTIL NAVMESH IS WORKING +option(WITH_GAMEENGINE "Enable Game Engine" ON) option(WITH_PLAYER "Build Player" OFF) # GHOST Windowing Library Options diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/build_files/cmake/cmake_static_check_cppcheck.py index f9f951b6e64..436470a7020 100644 --- a/build_files/cmake/cmake_static_check_cppcheck.py +++ b/build_files/cmake/cmake_static_check_cppcheck.py @@ -40,7 +40,7 @@ CHECKER_ARGS = [ "--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR, # "--max-configs=1", # speeds up execution # "--check-config", # when includes are missing - "--enable=all", # if you want sixty hundred pedantic suggestions + # "--enable=all", # if you want sixty hundred pedantic suggestions ] @@ -49,8 +49,6 @@ def main(): check_commands = [] for c, inc_dirs, defs in source_info: - # if not 'bevel' in c: continue - # if 'MOD' in c: continue cmd = ([CHECKER_BIN] + CHECKER_ARGS + [c] + @@ -63,7 +61,7 @@ def main(): process_functions = [] def my_process(i, c, cmd): - percent = 100.0 * (i / (len(check_commands))) + percent = 100.0 * (i / (len(check_commands) - 1)) percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:" sys.stdout.flush() diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index eeb8f375c3d..c5dc07e493a 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -202,7 +202,7 @@ class _GenericBone: @property def center(self): """The midpoint between the head and the tail.""" - return self.head.lerp(self.tail, 0.5) + return (self.head + self.tail) * 0.5 @property def length(self): @@ -650,7 +650,7 @@ class _GenericUI: draw_funcs = cls._dyn_ui_initialize() try: draw_funcs.remove(draw_func) - except ValueError: + except: pass diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index a7592ec9375..b6a450e1a02 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -170,8 +170,6 @@ class INFO_MT_file_export(Menu): if hasattr(bpy.types, "WM_OT_collada_export"): self.layout.operator("wm.collada_export", text="COLLADA (.dae)") - self.layout.operator("export_mesh.wavefront", text="Wavefront (.obj), BMesh") - class INFO_MT_file_external_data(Menu): bl_label = "External Data" diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 26ec7be1002..ebfeb0c6301 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -746,6 +746,9 @@ MTex *MeshImporter::assign_textures_to_uvlayer(COLLADAFW::TextureCoordinateBindi const CustomData *data = &me->fdata; int layer_index = CustomData_get_layer_index(data, CD_MTFACE); + + if(layer_index == -1) return NULL; + CustomDataLayer *cdl = &data->layers[layer_index+setindex]; /* set uvname to bind_vertex_input semantic */