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 069569f820 Merge branch 'master' into blender2.8 ...

In addition to pack of conflicts listed below, also had to comment out particle part of new Alembic code... :/

Conflicts:
	intern/ghost/intern/GHOST_WindowWin32.cpp
	source/blender/blenkernel/BKE_effect.h
	source/blender/blenkernel/BKE_pointcache.h
	source/blender/blenkernel/intern/cloth.c
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/effect.c
	source/blender/blenkernel/intern/particle_system.c
	source/blender/blenkernel/intern/pointcache.c
	source/blender/blenkernel/intern/rigidbody.c
	source/blender/blenkernel/intern/smoke.c
	source/blender/blenkernel/intern/softbody.c
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/gpu/intern/gpu_debug.c
	source/blender/makesdna/DNA_object_types.h
	source/blender/makesrna/intern/rna_particle.c

2016-08-21 13:18:26 +02:00

..

MOD_armature.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_array.c

Fix T46455: Array modifier could generate chained mapping of vertices, leading to corrupted geometry.

2016-01-30 18:02:40 +01:00

MOD_bevel.c

Change default for bevel to match previous behavior.

2015-07-05 13:31:26 -04:00

MOD_boolean_util.c

Fix T42767: Subsurfacing union boolean with same-named UVs crashes Blender

2014-12-02 17:50:34 +05:00

MOD_boolean_util.h

Cleanup: redundant struct declarations

2015-03-29 03:56:39 +11:00

MOD_boolean.c

Use BMesh solver for new boolean modifiers

2016-07-15 02:46:04 +10:00

MOD_build.c

Removed blenkernel particle code.

2016-04-13 10:49:39 +02:00

MOD_cast.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_cloth.c

Merge branch 'master' into blender2.8

2016-08-21 13:18:26 +02:00

MOD_collision.c

Merge branch 'master' into blender2.8

2016-05-24 16:48:10 +02:00

MOD_correctivesmooth.c

Cleanup: spelling, style

2016-07-08 00:48:45 +10:00

MOD_curve.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_datatransfer.c

Modifiers: add 'cd_flag' parameter to their ID looping callbacks, needed

2015-10-08 15:05:37 +02:00

MOD_decimate.c

BMesh: symmetry aware decimate

2015-11-18 10:52:00 +11:00

MOD_displace.c

Modifiers: add 'cd_flag' parameter to their ID looping callbacks, needed

2015-10-08 15:05:37 +02:00

MOD_dynamicpaint.c

Fix depsgraph to compute more accurate links for collision & force.

2016-08-16 15:46:36 +03:00

MOD_edgesplit.c

Depsgraph: New dependency graph integration commit

2015-05-12 16:06:37 +05:00

MOD_explode.c

Removed blenkernel particle code.

2016-04-13 10:49:39 +02:00

MOD_fluidsim_util.c

simplify redundant conditionals

2016-07-31 01:22:36 -04:00

MOD_fluidsim_util.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

MOD_fluidsim.c

Fix rare crash duplicating fluidsim

2015-05-25 00:19:39 +10:00

MOD_hook.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_laplaciandeform.c

Merge branch 'master' into blender2.8

2016-05-24 16:48:10 +02:00

MOD_laplaciansmooth.c

Eigen: fold remaining OpenNL code into intern/eigen.

2015-12-10 01:58:10 +01:00

MOD_lattice.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_mask.c

Modifiers: add 'cd_flag' parameter to their ID looping callbacks, needed

2015-10-08 15:05:37 +02:00

MOD_meshcache_mdd.c

Correct includes on different endian systems

2014-07-26 18:39:27 +10:00

MOD_meshcache_pc2.c

Cleanup: strcmp/strncmp -> STREQ/STREQLEN (in boolean usage).

2015-01-26 16:59:24 +01:00

MOD_meshcache_util.c

Code cleanup: remove unused includes

2014-05-01 04:47:51 +10:00

MOD_meshcache_util.h

Cleanup: redundant struct declarations

2015-03-29 03:56:39 +11:00

MOD_meshcache.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_meshdeform.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_meshsequencecache.c

Basic Alembic support

2016-08-06 10:58:13 +02:00

MOD_mirror.c

Modifiers: add 'cd_flag' parameter to their ID looping callbacks, needed

2015-10-08 15:05:37 +02:00

MOD_multires.c

Depsgraph: New dependency graph integration commit

2015-05-12 16:06:37 +05:00

MOD_none.c

Depsgraph: New dependency graph integration commit

2015-05-12 16:06:37 +05:00

MOD_normal_edit.c

Cleanup: warnings

2016-07-22 04:06:10 +10:00

MOD_ocean.c

C99/C++11: replace deprecated finite() by isfinite().

2016-05-17 21:39:16 +02:00

MOD_remesh.c

Remesh modifier has unnecessary MFace calculation

2015-08-04 22:11:43 +10:00

MOD_screw.c

Cleanup: parenthesize defines

2016-06-01 00:19:01 +10:00

MOD_shapekey.c

Merge branch 'master' into blender2.8

2016-06-07 09:59:26 +02:00

MOD_shrinkwrap.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_simpledeform.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_skin.c

BMesh: make toolflags optional

2016-07-01 19:29:22 +10:00

MOD_smoke.c

Fix depsgraph to compute more accurate links for collision & force.

2016-08-16 15:46:36 +03:00

MOD_smooth.c

Removed blenkernel particle code.

2016-04-13 10:49:39 +02:00

MOD_softbody.c

Merge branch 'master' into blender2.8

2016-08-21 13:18:26 +02:00

MOD_solidify.c

Merge branch 'master' into blender2.8

2016-07-12 00:07:44 +02:00

MOD_subsurf.c

Fix T46487: OpenSubdiv objects are invisible in Blender Internal "Rendered" viewport mode

2015-10-15 00:19:38 +05:00

MOD_surface.c

Cleanup: use proper ObjectWalkFunc typedef in modifiers' object callback func.

2015-10-05 15:57:10 +02:00

MOD_triangulate.c

Fix T46692: Triangulate creates duplicate faces

2015-11-06 01:13:23 +11:00

MOD_util.c

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

MOD_util.h

Eigen: fold remaining OpenNL code into intern/eigen.

2015-12-10 01:58:10 +01:00

MOD_uvproject.c

Modifiers: add 'cd_flag' parameter to their ID looping callbacks, needed

2015-10-08 15:05:37 +02:00

MOD_uvwarp.c

Cleanup: BLI_task - API changes.

2016-01-16 15:59:37 +01:00

MOD_warp.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_wave.c

Fix T47737: Lattice crashes w/ smooth modifier

2016-05-18 22:46:29 +10:00

MOD_weightvg_util.c

Fix (unreported) broken MixWeight modifier in debug builds.

2015-07-20 16:55:46 +02:00

MOD_weightvg_util.h

Code cleanup: use bools where possible

2014-02-03 19:35:44 +11:00

MOD_weightvgedit.c

Modifiers: add 'cd_flag' parameter to their ID looping callbacks, needed

2015-10-08 15:05:37 +02:00

MOD_weightvgmix.c

Depsgraph: Fix crash in Weight VG modifier

2016-07-11 15:15:26 +02:00

MOD_weightvgproximity.c

Depsgraph: Fix crash in Weight VG modifier

2016-07-11 15:15:26 +02:00

MOD_wireframe.c

Cleanup: comment blocks

2016-07-02 10:08:33 +10:00