Sculpt Branch:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 7 Dec 2009 19:22:48 +0000 (19:22 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 7 Dec 2009 19:22:48 +0000 (19:22 +0000)
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24889:25180

29 files changed:
1  2 
release/scripts/ui/properties_data_modifier.py
release/scripts/ui/space_console.py
release/scripts/ui/space_view3d.py
release/scripts/ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/mesh/editface.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/render/intern/source/convertblender.c

index e4c4072ffe28d55e71dc01cadddb23b53d128308,5e086435ddde15f4503e521cc85a7a0f9be04fab..7fe5e876f3396e6edb1d603be1c88d01bed2faa7
@@@ -69,8 -69,12 +69,13 @@@ 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()
+         layout.operator("screen.area_dupli")
+         layout.operator("screen.screen_full_area")
  
  class CONSOLE_MT_report(bpy.types.Menu):
      bl_label = "Report"
index 5f3a86e81b35fcb5e22fd0814a6343b9652d7144,af722c7f4d7e3ae09d63e8283ac590399fc304bf..ecaff9cbf40ad36adc8e472b071fef87f0aa001d
@@@ -1522,18 -1578,8 +1578,12 @@@ class VIEW3D_PT_3dview_properties(bpy.t
          col.prop(view, "clip_start", text="Start")
          col.prop(view, "clip_end", text="End")
  
-         col = layout.column(align=True)
-         col.label(text="Grid:")
-         col.prop(view, "grid_lines", text="Lines")
-         col.prop(view, "grid_spacing", text="Spacing")
-         col.prop(view, "grid_subdivisions", text="Subdivisions")
          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'
index de33b5b8cf58842e9a348b036df1da1c46b2d761,14c342d4ecd3e1f00a39152a7f593e3d519c03aa..76c0f2979995812062db32486245d97984bbe247
@@@ -413,10 -410,11 +410,11 @@@ static int modifier_apply_obdata(Report
                Curve *cu = ob->data;
                int numVerts;
                float (*vertexCos)[3];
+               
+               
                BKE_report(reports, RPT_INFO, "Applied modifier only changed CV points, not tesselated/bevel vertices");
+               
 -              if (!(md->mode&eModifierMode_Realtime) || (mti->isDisabled && mti->isDisabled(md))) {
 +              if (!(md->mode&eModifierMode_Realtime) || (mti->isDisabled && mti->isDisabled(md, 0))) {
                        BKE_report(reports, RPT_ERROR, "Modifier is disabled, skipping apply");
                        return 0;
                }