This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Bastien Montagne 4bf751be70 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/modifiers/intern/MOD_normal_edit.c
	source/blender/windowmanager/intern/wm_files.c

2018-06-14 12:39:52 +02:00

..

MOD_armature.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_array.c

Cleanup/fix wrong modifiers targets handling in COW context.

2018-05-30 12:04:06 +02:00

MOD_bevel.c

Cleanup: modifier arg wrapping

2018-05-12 08:04:56 +02:00

MOD_boolean.c

Silence false positive warning on boolean modifier

2018-06-13 16:04:31 +02:00

MOD_build.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_cast.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_cloth.c

Modifiers: ported Cloth DerivedMesh → Mesh

2018-05-22 17:11:30 +02:00

MOD_collision.c

Moved function declarations from BKE_mesh.h → BKE_mesh_runtime.h

2018-06-05 16:59:18 +02:00

MOD_correctivesmooth.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_curve.c

Cleanup: modifier arg wrapping

2018-05-12 08:04:56 +02:00

MOD_datatransfer.c

Cleanup: modifier arg wrapping

2018-05-12 08:04:56 +02:00

MOD_decimate.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_displace.c

Removed old mention of CDDerivedMesh

2018-06-01 11:50:53 +02:00

MOD_dynamicpaint.c

Cleanup: Moar G.main removal of Hell.

2018-06-11 12:15:14 +02:00

MOD_edgesplit.c

Merge branch 'master' into blender2.8

2018-06-13 16:42:56 +02:00

MOD_explode.c

Particle System: ported most DerivedMesh → Mesh

2018-05-16 16:31:38 +02:00

MOD_fluidsim_util.c

Merge branch 'master' into blender2.8

2018-06-09 15:18:21 +02:00

MOD_fluidsim_util.h

Fix last usages of Scene.r.cfra in modifiers code.

2018-05-23 16:37:36 +02:00

MOD_fluidsim.c

Fix last usages of Scene.r.cfra in modifiers code.

2018-05-23 16:37:36 +02:00

MOD_hook.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_laplaciandeform.c

Moved function declarations from BKE_mesh.h → BKE_mesh_runtime.h

2018-06-05 16:59:18 +02:00

MOD_laplaciansmooth.c

Fix compiler warnings.

2018-05-13 14:48:55 +02:00

MOD_lattice.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_mask.c

Cleanup: modifier arg wrapping

2018-05-12 08:04:56 +02:00

MOD_meshcache_mdd.c

Cleanup: modifier arg wrapping

2018-05-12 08:04:56 +02:00

MOD_meshcache_pc2.c

Cleanup: modifier arg wrapping

2018-05-12 08:04:56 +02:00

MOD_meshcache_util.c

Cleanup: modifier arg wrapping

2018-05-12 08:04:56 +02:00

MOD_meshcache_util.h

Cleanup: modifier arg wrapping

2018-05-12 08:04:56 +02:00

MOD_meshcache.c

Merge branch 'master' into blender2.8

2018-06-09 15:18:21 +02:00

MOD_meshdeform.c

Modifiers: tiny optimizations for mesh deform, lattice, kdop.

2018-06-01 12:00:11 +02:00

MOD_meshsequencecache.c

Alembic import: assign cache_file handle to original datablock

2018-06-08 13:52:53 +02:00

MOD_mirror.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_multires.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_none.c

Modifiers: Add wrapper functions with Mesh / DerivedMesh conversion

2018-05-01 18:02:17 +02:00

MOD_normal_edit.c

Merge branch 'master' into blender2.8

2018-06-14 12:39:52 +02:00

MOD_ocean.c

Merge branch 'master' into blender2.8

2018-06-09 15:18:21 +02:00

MOD_particleinstance.c

Cleanup: style

2018-06-06 22:17:06 +02:00

MOD_particlesystem.c

Cleanup: remove G.main from BKE modifier.

2018-05-31 15:24:30 +02:00

MOD_remesh.c

Moved function declarations from BKE_mesh.h → BKE_mesh_runtime.h

2018-06-05 16:59:18 +02:00

MOD_screw.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_shapekey.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_shrinkwrap.c

Cleanup/fix wrong modifiers targets handling in COW context.

2018-05-30 12:04:06 +02:00

MOD_simpledeform.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_skin.c

Merge branch 'master' into blender2.8

2018-06-01 18:26:42 +02:00

MOD_smoke.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_smooth.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_softbody.c

Modifiers: ported Soft Body DerivedMesh → Mesh

2018-06-01 10:04:46 +02:00

MOD_solidify.c

Cleanup: use 'nomain' when not in library data

2018-05-08 17:06:30 +02:00

MOD_subsurf.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_surface.c

Fix last usages of Scene.r.cfra in modifiers code.

2018-05-23 16:37:36 +02:00

MOD_surfacedeform.c

Moved function declarations from BKE_mesh.h → BKE_mesh_runtime.h

2018-06-05 16:59:18 +02:00

MOD_triangulate.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_util.c

Modifiers: Bring back custom data referencing logic

2018-05-30 17:00:47 +02:00

MOD_util.h

Fix modifiers not using depsgraph time for texture evaluation.

2018-05-23 15:55:13 +02:00

MOD_uvproject.c

Fix T55282: Modifiers: Removed unnecessary object evaluation

2018-06-01 11:50:53 +02:00

MOD_uvwarp.c

Merge branch 'master' into blender2.8

2018-05-12 08:22:03 +02:00

MOD_warp.c

Fix modifiers not using depsgraph time for texture evaluation.

2018-05-23 15:55:13 +02:00

MOD_wave.c

Fix modifiers not using depsgraph time for texture evaluation.

2018-05-23 15:55:13 +02:00

MOD_weightvg_util.c

Fix modifiers not using depsgraph time for texture evaluation.

2018-05-23 15:55:13 +02:00

MOD_weightvg_util.h

Fix modifiers not using depsgraph time for texture evaluation.

2018-05-23 15:55:13 +02:00

MOD_weightvgedit.c

Modifiers: Bring back custom data referencing logic

2018-05-30 17:00:47 +02:00

MOD_weightvgmix.c

Modifiers: Bring back custom data referencing logic

2018-05-30 17:00:47 +02:00

MOD_weightvgproximity.c

Modifiers: Bring back custom data referencing logic

2018-05-30 17:00:47 +02:00

MOD_wireframe.c

Merge branch 'master' into blender2.8

2018-05-08 15:20:18 +02:00