2.5 Sculpt Branch Merge
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 11 Dec 2009 15:30:38 +0000 (15:30 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 11 Dec 2009 15:30:38 +0000 (15:30 +0000)
http://www.blender.org/development/release-logs/blender-250/sculpt-and-multiresolution/

Release logs are work in progress, also check missing items on that
page, there's still a few things that need work.

Quick summary of the changes:

* Use BVH for optimizing sculpt mode, doing only editing and updates
  on nearby nodes.
* Memory reduction by use of CCG grids for subsurf, own undo stack,
  no vertex-face map, no origindex, .. .
* Multithreading for sculpting, multires, and subsurf.
* Optional external file storage for multires displacements.
* Various tweaks to brush behavior.

intern/guardedalloc/intern/mallocn.c
release/scripts/ui/properties_physics_softbody.py
release/scripts/ui/space_console.py
release/scripts/ui/space_view3d.py

index 5f7c725f5b5c5d33463856dd70c267c331ede414..d1114af2437c09e7a5a27e41cdd7ade2574701de 100644 (file)
@@ -402,51 +402,15 @@ void MEM_printmemlist_stats()
        }
        totpb= b+1;
 
-#define MEM_IN_MB(mem) ((double)mem/(double)(1024*1024))
-
        /* sort by length and print */
        qsort(printblock, totpb, sizeof(MemPrintBlock), compare_len);
-       printf("\ntotal memory len: %.3f MB\n", MEM_IN_MB(mem_in_use));
+       printf("\ntotal memory len: %.3f MB\n", (double)mem_in_use/(double)(1024*1024));
        for(a=0, pb=printblock; a<totpb; a++, pb++)
-               printf("%s items: %d, len: %.3f MB\n", pb->name, pb->items, MEM_IN_MB(pb->len));
-       
-       {
-               uintptr_t other= mem_in_use;
-
-               printf(
-                       "from pylab import *\n"
-                       "\n"
-                       "figure(1, figsize=(10,10))\n"
-                       "\n"
-                       "memory = [\n");
-
-               for(a=0, pb=printblock; a<totpb; a++, pb++) {
-                       printf("[\"%s (%.3f MB)\", %.3f],\n", pb->name, MEM_IN_MB(pb->len), MEM_IN_MB(pb->len));
-                       other -= pb->len;
-
-                       if((double)pb->len/(double)mem_in_use < 0.025)
-                               break;
-               }
-
-               printf(
-                       "[\"other\", %.3f]]\n"
-                       "\n"
-                       "labels = [m[0] for m in memory]\n"
-                       "fracs = [m[1] for m in memory]\n"
-                       "map = cm.get_cmap(\"Paired\")\n"
-                       "colors = [map(float(i)/len(fracs)) for i in range(0, len(fracs))]\n"
-                       "\n"
-                       "pie(fracs, labels=labels, colors=colors, autopct='%%1.1f%%%%')\n"
-                       "title(\"Memory Usage: %.3f MB\")\n"
-                       "\n"
-                       "show()\n", MEM_IN_MB(other), MEM_IN_MB(mem_in_use));
-       }
+               printf("%s items: %d, len: %.3f MB\n", pb->name, pb->items, (double)pb->len/(double)(1024*1024));
 
        free(printblock);
        
        mem_unlock_thread();
-
-#undef MEM_IN_MB
 }
 
 /* Prints in python syntax for easy */
index 4cecb7ee087efbb59e9716121bc2b9eb4dc4be41..60b9c08ee58b428b8644878e10f40786a4bd998a 100644 (file)
@@ -177,7 +177,6 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel):
         col.prop(softbody, "bending")
         col.prop(softbody, "spring_length", text="Length")
         col.prop_object(softbody, "spring_vertex_group", ob, "vertex_groups", text="Springs:")
-        col.item_pointerR(softbody, "spring_vertex_group", ob, "vertex_groups", text="Springs:")
 
         if wide_ui:
             col = split.column()
index 7fe5e876f3396e6edb1d603be1c88d01bed2faa7..5e086435ddde15f4503e521cc85a7a0f9be04fab 100644 (file)
@@ -69,7 +69,6 @@ class CONSOLE_MT_console(bpy.types.Menu):
         layout.operator("console.copy")
         layout.operator("console.paste")
         layout.menu("CONSOLE_MT_language")
-        layout.itemM("CONSOLE_MT_language")
 
         layout.separator()
 
@@ -88,8 +87,6 @@ class CONSOLE_MT_report(bpy.types.Menu):
         layout.operator("console.report_delete")
         layout.operator("console.report_copy")
 
-class CONSOLE_MT_language(bpy.types.Menu):
-    bl_label = "Languages..."
 
 class CONSOLE_MT_language(bpy.types.Menu):
     bl_label = "Languages..."
index c8f10d692b456b61ff726182a4f5d9deee021b44..af351f86d869a0c236046eead8e6563186115300 100644 (file)
@@ -1580,10 +1580,6 @@ class VIEW3D_PT_3dview_properties(bpy.types.Panel):
 
         layout.column().prop(scene, "cursor_location", text="3D Cursor:")
 
-class VIEW3D_PT_3dview_item(bpy.types.Panel):
-    bl_space_type = 'VIEW_3D'
-    bl_region_type = 'UI'
-    bl_label = "Item"
 
 class VIEW3D_PT_3dview_name(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'