Merging r58196 through r58265 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 15 Jul 2013 11:25:56 +0000 (11:25 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 15 Jul 2013 11:25:56 +0000 (11:25 +0000)
14 files changed:
1  2 
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/lattice.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/editors/object/object_add.c
source/blender/editors/render/render_internal.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_main_api.c

index 5d69ccd2d3f64199b3b0755e59f0bdfe427689ae,fd9312629040ad9a405b995c3e78de99dcdf92ca..8104fc169f606b85be32a3b871a14de2cc943861
@@@ -359,14 -361,11 +361,16 @@@ Mesh *rna_Main_meshes_new_from_object
                                BKE_mesh_from_metaball(&disp, tmpmesh);
                                BKE_displist_free(&disp);
                        }
 -                      else
 -                              BKE_mesh_from_metaball(&ob->disp, tmpmesh);
 +                      else {
 +                              ListBase disp = {NULL, NULL};
 +                              if (ob->curve_cache) {
 +                                      disp = ob->curve_cache->disp;
 +                              }
 +                              BKE_mesh_from_metaball(&disp, tmpmesh);
 +                      }
  
+                       BKE_mesh_texspace_copy_from_object(tmpmesh, ob);
                        break;
  
                }