Bastien Montagne cfbd605567 Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/blender/addon/ui.py
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenkernel/intern/particle_distribute.c
	source/blender/blenkernel/intern/texture.c
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/physics/particle_object.c
	source/blender/editors/transform/transform_snap_object.c

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

..

__init__.py

Merge branch 'master' into blender2.8

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

properties_animviz.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_constraint.py

Revert "ChildOf Constraint: Hide the Loc/Rot/Scale toggles"

2016-07-08 01:59:43 +12:00

properties_data_armature.py

Fix T45689: Pose Libraries cannot be used when using lib-linked actions as poselibs

2015-08-22 18:16:55 +12:00

properties_data_bone.py

Bendy Bones: Small ui tweak

2016-05-17 18:08:04 +02:00

properties_data_camera.py

Cycles: Pole merging for spherical stereo

2016-05-18 10:56:57 +02:00

properties_data_curve.py

Text Object: Vertical Alignment

2016-06-20 23:21:24 -03:00

properties_data_empty.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_data_lamp.py

Full Inverse-Quadratic-Equation Lamp Falloff

2016-03-13 02:05:36 +01:00

properties_data_lattice.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_data_mesh.py

Cleanup: rename clear_skin & clear_mask operators to skin_clear and mask_clear.

2015-05-03 15:18:27 +02:00

properties_data_metaball.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_data_modifier.py

Merge branch 'master' into blender2.8

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

properties_data_speaker.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_freestyle.py

Cleanup: pep8

2015-09-01 13:03:38 +10:00

properties_game.py

Environment lighting for the GLSL mode

2016-07-04 11:01:32 +03:00

properties_grease_pencil_common.py

GPencil UI: Streamline toolbar options a bit

2016-06-24 03:18:33 +12:00

properties_mask_common.py

Cleanup: pep8, spelling

2015-04-22 16:26:54 +10:00

properties_material.py

BGE: grey out Alpha and Specular sliders when Transparency panel is

2015-05-22 16:03:38 +02:00

properties_object.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_paint_common.py

Removed most partical-related code from UI scripts.

2016-04-12 16:28:00 +02:00

properties_physics_cloth.py

Removed UI for point cache users.

2016-04-28 18:38:10 +02:00

properties_physics_common.py

Removed UI for point cache users.

2016-04-28 18:38:10 +02:00

properties_physics_dynamicpaint.py

Removed UI for point cache users.

2016-04-28 18:38:10 +02:00

properties_physics_field.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_physics_fluid.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_physics_rigidbody_constraint.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_physics_rigidbody.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

properties_physics_smoke.py

Removed UI for point cache users.

2016-04-28 18:38:10 +02:00

properties_physics_softbody.py

Removed UI for point cache users.

2016-04-28 18:38:10 +02:00

properties_render_layer.py

Collapse multiview panel in render layers by default

2015-08-08 20:55:51 +02:00

properties_render.py

Render border: make it work together with with cache result / save buffers / full sample.

2016-07-05 21:59:02 +02:00

properties_scene.py

Removed UI for point cache users.

2016-04-28 18:38:10 +02:00

properties_texture.py

Removed most partical-related code from UI scripts.

2016-04-12 16:28:00 +02:00

properties_world.py

cleanup: pep8

2015-01-29 15:35:06 +11:00

space_clip.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_console.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_dopesheet.py

Merge branch 'master' into blender2.8

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

space_filebrowser.py

Revert part of rB4d9345479aa86f61, and cleanup a bit.

2015-10-16 11:21:12 +02:00

space_graph.py

Code Cleanup - Circle/Lasso select in the Graph Editor

2016-06-24 03:18:34 +12:00

space_image.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_info.py

Info Header / URLs: Fix community link + https'ification.

2016-05-08 23:38:41 +02:00

space_logic.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_nla.py

NLA: Indicate position of action-local markers on strips

2016-07-08 01:47:32 +12:00

space_node.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_outliner.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_properties.py

UI: Replace +/- menus with collapsible ones

2014-01-27 18:42:11 +11:00

space_sequencer.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_text.py

Fix T48703: Name inconsistency w/ area maximize/fullscreen

2016-06-22 07:47:30 +10:00

space_time.py

Merge branch 'master' into blender2.8

2016-06-22 13:12:44 +02:00

space_userpref.py

Removed most partical-related code from UI scripts.

2016-04-12 16:28:00 +02:00

space_view3d_toolbar.py

Merge branch 'master' into blender2.8

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

space_view3d.py

Merge branch 'master' into blender2.8

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