Julian Eisel a5cba9aab9 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_nla/nla_draw.c
	source/blender/editors/space_view3d/view3d_draw.c

2017-03-06 13:00:46 +01:00

..

MOD_armature.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_array.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_bevel.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01: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

Merge branch 'master' into blender2.8

2017-03-06 13:00:46 +01:00

MOD_build.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_cast.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_cloth.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_collision.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_correctivesmooth.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_curve.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_datatransfer.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_decimate.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_displace.c

Merge branch 'master' into blender2.8

2017-02-23 10:56:28 +01:00

MOD_dynamicpaint.c

Merge branch 'master' into blender2.8

2017-03-02 00:22:13 +11:00

MOD_edgesplit.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_explode.c

Merge branch 'master' into blender2.8

2017-02-08 13:10:16 +01: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

Sorted BaseLegacy > Base convertions

2017-02-14 18:21:47 +01:00

MOD_hook.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_laplaciandeform.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_laplaciansmooth.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_lattice.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_mask.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01: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

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_meshdeform.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_meshsequencecache.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_mirror.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_multires.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_none.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_normal_edit.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_ocean.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_particleinstance.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_particlesystem.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_remesh.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_screw.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_shapekey.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_shrinkwrap.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_simpledeform.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_skin.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_smoke.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_smooth.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_softbody.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_solidify.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_subsurf.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_surface.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_surfacedeform.c

Merge branch 'master' into blender2.8

2017-03-06 13:00:46 +01:00

MOD_triangulate.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00

MOD_util.c

Surface Deform Modifier (SDef)

2017-02-27 13:49:14 -03:00

MOD_util.h

Eigen: fold remaining OpenNL code into intern/eigen.

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

MOD_uvproject.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_uvwarp.c

Silence "defined but not used" warnings

2017-02-23 10:24:59 +01:00

MOD_warp.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_wave.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01: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

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_weightvgmix.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_weightvgproximity.c

Merge branch 'master' into blender2.8

2017-01-31 10:47:43 +01:00

MOD_wireframe.c

Depsgraph: Remove legacy updateDepgraph callbacks from modifiers

2017-01-24 12:49:23 +01:00