Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 12 Aug 2017 04:06:02 +0000 (14:06 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 12 Aug 2017 04:06:29 +0000 (14:06 +1000)
21 files changed:
1  2 
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/fluidsim.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform_snap_object.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
source/blender/python/mathutils/mathutils_bvhtree.c

index 6ac284d6b73bc8ff4783e141d5f0542fe9fe517f,ae896176b6d14c83a00aa6d8448c98e53c3a126e..45c3e92b70bd689da9dc74d06ee9288fcd71a2f4
@@@ -2062,11 -2060,8 +2062,8 @@@ DerivedMesh *dynamicPaint_Modifier_do(D
        if (pmd->canvas) {
                DerivedMesh *ret;
  
-               /* For now generate looptris in every case */
-               DM_ensure_looptri(dm);
                /* Update canvas data for a new frame */
 -              dynamicPaint_frameUpdate(pmd, scene, ob, dm);
 +              dynamicPaint_frameUpdate(pmd, eval_ctx, scene, ob, dm);
  
                /* Return output mesh */
                ret = dynamicPaint_Modifier_apply(pmd, ob, dm);
                return ret;
        }
        else {
-               /* For now generate looptris in every case */
-               DM_ensure_looptri(dm);
                /* Update canvas data for a new frame */
 -              dynamicPaint_frameUpdate(pmd, scene, ob, dm);
 +              dynamicPaint_frameUpdate(pmd, eval_ctx, scene, ob, dm);
  
                /* Return output mesh */
                return dynamicPaint_Modifier_apply(pmd, ob, dm);
index 5599190010d02072717decd84d2386bd80c0da7c,8e98a9f672d8f957399317d72ff0c0eb44edbd6d..96637fa54584b5c03798a36e47e5ac95779454b6
@@@ -78,10 -78,8 +78,8 @@@ void initElbeemMesh(struct EvaluationCo
        float *verts;
        int *tris;
  
 -      dm = mesh_create_derived_index_render(scene, ob, CD_MASK_BAREMESH, modifierIndex);
 +      dm = mesh_create_derived_index_render(eval_ctx, scene, ob, CD_MASK_BAREMESH, modifierIndex);
  
-       DM_ensure_looptri(dm);
        mvert = dm->getVertArray(dm);
        mloop = dm->getLoopArray(dm);
        looptri = dm->getLoopTriArray(dm);