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

..

intern

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00

CMakeLists.txt

Another big patch set by Bastien Montagne, thanks a lot!

2012-12-20 07:57:26 +00:00

DNA_action_types.h

Clay Engine: Prepare for Armature drawing.

2017-02-22 12:46:27 +01:00

DNA_actuator_types.h

BGE: Remove KX_IPOActuator.

2015-11-03 10:31:08 +01:00

DNA_anim_types.h

Graph editor: Add channel option to make it persistent on display

2016-09-12 15:39:40 +02:00

DNA_armature_types.h

Bendy Bones: Advanced B-Bones for Easier + Simple Rigging

2016-05-18 03:19:06 +12:00

DNA_boid_types.h

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

DNA_brush_types.h

Cleanup: unused brush DNA

2016-07-21 07:17:43 +10:00

DNA_cachefile_types.h

Alembic: store a pointer to the object reader in the cache modifiers and

2016-10-29 12:23:09 +02:00

DNA_camera_types.h

Clay Engine: camera drawing

2017-03-05 18:10:08 +01:00

DNA_cloth_types.h

Cloth Simulation: add time scale property

2016-07-30 15:14:26 +10:00

DNA_color_types.h

Support Auto-Clamped Handle for Curve-Mapping

2016-08-01 09:06:40 +10:00

DNA_constraint_types.h

Alembic: store a pointer to the object reader in the cache modifiers and

2016-10-29 12:23:09 +02:00

DNA_controller_types.h

BGE - button for deactivate sensors, controllers and actuators

2014-04-16 22:40:07 -03:00

DNA_curve_types.h

Dopesheet: Added "Moving Hold" as a keyframe type

2016-07-08 01:49:25 +12:00

DNA_customdata_types.h

Support Vertex Color in GLSL viewport for Cycles

2016-05-23 10:23:43 +02:00

DNA_defs.h

DNA Deprecation: add DNA_DEPRECATED_GCC_POISON for enum/structs.

2013-12-10 13:01:55 +11:00

DNA_documentation.h

DNA; document how to ignore a struct

2015-05-08 06:54:13 +10:00

DNA_dynamicpaint_types.h

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

DNA_effect_types.h

unify include guard defines, __$FILENAME__

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

DNA_fileglobal_types.h

Refactor BKE_blender into separate headers

2016-04-25 19:27:45 +10:00

DNA_freestyle_types.h

Cleanup: #define -> enums.

2014-11-19 20:49:18 +01:00

DNA_genfile.h

Add DNA_struct_find (useful for version patching)

2016-08-13 01:40:19 +02:00

DNA_gpencil_types.h

Merge branch 'master' into blender2.8

2017-01-05 00:31:15 +01:00

DNA_gpu_types.h

Depth of field high quality:

2015-03-19 15:18:14 +01:00

DNA_group_types.h

Data previews: add preview to Object, Group and Scene.

2015-08-10 15:41:28 +02:00

DNA_ID.h

Fix T50369: Objects can't be deleted from scene when using "link group objects to scene"

2017-01-04 10:28:59 +01:00

DNA_image_types.h

World textures displaying for viewport in BI.

2016-01-27 12:06:57 +03:00

DNA_ipo_types.h

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

DNA_key_types.h

Remove slurph shape-key feature

2015-01-07 02:06:37 +11:00

DNA_lamp_types.h

Clay Engine: More Lamp drawing work

2017-03-05 18:10:08 +01:00

DNA_lattice_types.h

Make lattice deform safe for threading

2013-08-19 10:11:48 +00:00

DNA_layer_types.h

Collections Settings: Added Bool type.

2017-02-15 18:18:43 +01:00

DNA_linestyle_types.h

Code cleanup: White space and dead code.

2015-07-10 23:15:57 +09:00

DNA_listBase.h

patch [#34103] - listbase.patch, insertlinkbefore.patch

2013-02-22 14:12:55 +00:00

DNA_mask_types.h

Mask: add option to detect self intersections

2014-02-13 19:12:28 +11:00

DNA_material_types.h

Clay-Engine (merge clay-engine)

2017-02-07 11:31:22 +01:00

DNA_mesh_types.h

Convert MBC_ API to Mesh (instead of derived mesh) and move it to mesh_render

2017-01-25 10:01:48 +01:00

DNA_meshdata_types.h

Fix T44048: freestyle lines in Cycles are in the wrong color space.

2015-10-10 18:44:19 +02:00

DNA_meta_types.h

Remove unused bounding box from MetaBall

2013-08-19 09:41:13 +00:00

DNA_modifier_types.h

Surface Deform Modifier: Respect object transforms at bind time

2017-03-06 03:43:26 -03:00

DNA_movieclip_types.h

Fix T49571: 2d stabilize keys not visible in the Graph Editor and Dope Sheet

2016-10-14 17:22:57 +02:00

DNA_nla_types.h

code cleanup: comment/remove unused defines

2013-05-28 01:15:59 +00:00

DNA_node_types.h

Fix T50736: Zero streaks in Glare node.

2017-02-23 10:39:51 +01:00

DNA_object_fluidsim.h

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

DNA_object_force.h

Add "Gravitation" option to "Force" type force fields

2017-02-23 19:23:39 -03:00

DNA_object_types.h

Layers: Per-Collection edit mode parsing

2017-02-13 00:25:30 +01:00

DNA_outliner_types.h

Outliner: "All Collections" mode showing the master collection hierarchy

2017-02-27 22:24:59 +01:00

DNA_packedFile_types.h

Cleanup: style & const's

2015-05-05 05:19:49 +10:00

DNA_particle_types.h

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

DNA_property_types.h

code cleanup: comment/remove unused defines

2013-05-28 01:15:59 +00:00

DNA_rigidbody_types.h

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

DNA_scene_types.h

Remove all instance of OBACT from particle_edit.c and related changes

2017-03-02 17:14:59 +01:00

DNA_screen_types.h

UI: Previews for screen layouts

2016-12-01 17:19:58 +01:00

DNA_sdna_types.h

Use BLI_endian_switch in dna_genfile

2016-07-14 13:28:24 +10:00

DNA_sensor_types.h

Cleanup: unused defines

2015-11-12 18:54:26 +11:00

DNA_sequence_types.h

Sequencer text strip color options

2016-04-27 15:49:13 +10:00

DNA_smoke_types.h

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

DNA_sound_types.h

DNA: replace GCC poison with ifdef for enums

2015-07-10 15:58:50 +10:00

DNA_space_types.h

Outliner: "All Collections" mode showing the master collection hierarchy

2017-02-27 22:24:59 +01:00

DNA_speaker_types.h

unify include guard defines, __$FILENAME__

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

DNA_text_types.h

code cleanup: comment/remove unused defines

2013-05-28 01:15:59 +00:00

DNA_texture_types.h

Color sources for point density textures based on mesh vertices

2016-03-24 12:07:03 +01:00

DNA_tracking_types.h

2D stabilizer: Revert majority of UI change

2016-08-16 14:25:55 +02:00

DNA_userdef_types.h

Revert "Collection Editor based on patch by Julian Eisel"

2017-02-15 18:17:34 +01:00

DNA_vec_types.h

svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

DNA_vfont_types.h

Defines: replace ELEM3-16 with ELEM(...), that can take varargs

2014-07-20 01:33:40 +10:00

DNA_view2d_types.h

Fix T44432: Zoom to mouse fails /w FCurve editor

2015-04-21 13:10:32 +10:00

DNA_view3d_types.h

Viewport: move the background to the "modern" viewport

2016-10-24 19:05:49 +00:00

DNA_windowmanager_types.h

Fix T47204: selection failing directly after disabling multisample in user prefs.

2016-02-06 12:21:41 +01:00

DNA_world_types.h

Clay Engine: camera drawing

2017-03-05 18:10:08 +01:00