Revision: 44255 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44255 Author: campbellbarton Date: 2012-02-19 18:41:30 +0000 (Sun, 19 Feb 2012) Log Message: ----------- misc changes from trunk (avoid confusion since these were not intentional differences)
Modified Paths: -------------- branches/bmesh/blender/CMakeLists.txt branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py branches/bmesh/blender/release/scripts/modules/bpy_types.py branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py branches/bmesh/blender/source/blender/collada/MeshImporter.cpp Property Changed: ---------------- branches/bmesh/blender/ Property changes on: branches/bmesh/blender ___________________________________________________________________ Modified: svn:mergeinfo - /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439 /branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230 /trunk/blender:39992-44250 + /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439 /branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230 /trunk/blender:39992-44252 Modified: branches/bmesh/blender/CMakeLists.txt =================================================================== --- branches/bmesh/blender/CMakeLists.txt 2012-02-19 18:31:04 UTC (rev 44254) +++ branches/bmesh/blender/CMakeLists.txt 2012-02-19 18:41:30 UTC (rev 44255) @@ -129,7 +129,7 @@ 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 Modified: branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py =================================================================== --- branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-02-19 18:31:04 UTC (rev 44254) +++ branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-02-19 18:41:30 UTC (rev 44255) @@ -40,7 +40,7 @@ "--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 @@ 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 @@ 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() Modified: branches/bmesh/blender/release/scripts/modules/bpy_types.py =================================================================== --- branches/bmesh/blender/release/scripts/modules/bpy_types.py 2012-02-19 18:31:04 UTC (rev 44254) +++ branches/bmesh/blender/release/scripts/modules/bpy_types.py 2012-02-19 18:41:30 UTC (rev 44255) @@ -202,7 +202,7 @@ @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 @@ draw_funcs = cls._dyn_ui_initialize() try: draw_funcs.remove(draw_func) - except ValueError: + except: pass Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py =================================================================== --- branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py 2012-02-19 18:31:04 UTC (rev 44254) +++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py 2012-02-19 18:41:30 UTC (rev 44255) @@ -170,9 +170,7 @@ 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" Modified: branches/bmesh/blender/source/blender/collada/MeshImporter.cpp =================================================================== --- branches/bmesh/blender/source/blender/collada/MeshImporter.cpp 2012-02-19 18:31:04 UTC (rev 44254) +++ branches/bmesh/blender/source/blender/collada/MeshImporter.cpp 2012-02-19 18:41:30 UTC (rev 44255) @@ -746,6 +746,9 @@ 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 */ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs