griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
069569f82011c833937df07ec7945751c02f0a9c
test/source/blender/blenkernel
History
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
..
intern
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
BKE_action.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_addon.h
GHash: avoid redundant casts
2015-05-11 12:39:39 +10:00
BKE_anim.h
Fix T44183 particles in linked group offset from object
2015-04-02 17:13:45 +02:00
BKE_animsys.h
Py-Driver: add 'self' option
2016-07-30 16:46:13 +10:00
BKE_appdir.h
Add bpy.app.binary_path_python
2015-05-06 11:13:42 +10:00
BKE_armature.h
Fix (unreported) crash in some case when remapping armature data.
2016-07-21 16:54:36 +02:00
BKE_autoexec.h
…
BKE_blender_copybuffer.h
Refactor BKE_blender into separate headers
2016-04-25 19:27:45 +10:00
BKE_blender_undo.h
Cleanup: remove bad-level call
2016-06-25 21:19:54 +10:00
BKE_blender_version.h
Grease Pencil v2 Branch
2016-08-03 23:39:36 +02:00
BKE_blender.h
BKE_blender: Add own atexit functions
2016-06-24 10:05:18 +10:00
BKE_blendfile.h
Refactor BKE_blender into separate headers
2016-04-25 19:27:45 +10:00
BKE_bmfont_types.h
…
BKE_bmfont.h
…
BKE_bpath.h
Fix T44543: painted texture lost after first save
2015-05-18 13:42:47 +10:00
BKE_brush.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_bullet.h
…
BKE_bvhutils.h
Cleanup: comment blocks
2016-07-02 10:08:33 +10:00
BKE_cachefile.h
Basic Alembic support
2016-08-06 10:58:13 +02:00
BKE_camera.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_ccg.h
…
BKE_cdderivedmesh.h
Fix T46215: Explode modifier looses textures
2015-09-23 22:57:00 +10:00
BKE_cloth.h
Merge branch 'master' into blender2.8
2016-08-06 12:45:03 +02:00
BKE_collision.h
Fix depsgraph to compute more accurate links for collision & force.
2016-08-16 15:46:36 +03:00
BKE_colortools.h
Support Auto-Clamped Handle for Curve-Mapping
2016-08-01 09:06:40 +10:00
BKE_constraint.h
Cleanup: use const for typeinfo
2015-03-30 21:18:49 +11:00
BKE_context.h
Merge branch 'master' into blender2.8
2016-08-06 12:45:03 +02:00
BKE_crazyspace.h
DerivedMesh: cleanup & minor edirs
2015-07-02 16:20:22 +10:00
BKE_curve.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_customdata_file.h
BKE_image: use BKE_image_*** prefix
2015-01-24 17:26:59 +11:00
BKE_customdata.h
Cleanup: use const args
2016-05-17 03:07:40 +10:00
BKE_data_transfer.h
Cleanup: warnings, style
2015-07-25 07:44:25 +10:00
BKE_deform.h
Fix group flipping when syncing mirror weights
2016-02-09 00:19:28 +11:00
BKE_depsgraph.h
Fix T45702: Editing smoke while viewport render and blender bug
2015-08-27 12:10:01 +02:00
BKE_DerivedMesh.h
EditMesh: Avoid creating deform-vert layer every redraw
2016-06-22 21:31:00 +10:00
BKE_displist.h
Cleanup: use BLI_bitmap for bevel-split
2016-06-25 11:24:25 +10:00
BKE_dynamicpaint.h
Merge branch 'master' into blender2.8
2016-05-24 16:48:10 +02:00
BKE_editmesh_bvh.h
BMesh: add BKE_bmbvh_find_face_closest
2015-12-14 00:16:05 +11:00
BKE_editmesh.h
Docs: doxy cleanup/minor edits
2015-08-01 12:37:52 +10:00
BKE_effect.h
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
BKE_fcurve.h
Py-Driver: add 'self' option
2016-07-30 16:46:13 +10:00
BKE_fluidsim.h
Cleanup: redundant struct declarations
2015-03-29 03:56:39 +11:00
BKE_font.h
Fix missing datablocks types in id_make_local.
2016-07-21 16:54:36 +02:00
BKE_freestyle.h
Freestyle: pass Main struct to new/copy
2015-03-19 14:34:14 +11:00
BKE_global.h
Environment lighting for the GLSL mode
2016-07-04 11:01:32 +03:00
BKE_gpencil.h
Cleanup: Use BKE_gpencil prefix
2016-08-04 15:11:21 +02:00
BKE_group.h
Fix missing datablocks types in id_make_local.
2016-07-21 16:54:36 +02:00
BKE_icons.h
Fix (IRC reported by Sergey) assert regarding icon_id of newly copied datablocks.
2016-07-19 16:27:40 +02:00
BKE_idcode.h
Fix ID types DAG update tagging.
2016-08-08 17:51:15 +02:00
BKE_idprop.h
cleanup: redundant casts & const cast correctness
2015-01-01 23:42:28 +11:00
BKE_image.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_ipo.h
…
BKE_key.h
Get rid of BKE_key_make_local().
2016-07-14 18:33:12 +02:00
BKE_lamp.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_lattice.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_library_idmap.h
readfile: optimization for undo
2016-06-07 17:27:52 +10:00
BKE_library_query.h
Initial fix for proxy issues regarding new libquery/libremap ID handling code.
2016-07-08 19:33:22 +02:00
BKE_library_remap.h
Refactor remapping's pre/post process of special cases.
2016-07-08 18:11:20 +02:00
BKE_library.h
Merge branch 'master' into blender2.8
2016-08-06 12:45:03 +02:00
BKE_linestyle.h
Fix missing datablocks types in id_make_local.
2016-07-21 16:54:36 +02:00
BKE_main.h
Merge branch 'master' into blender2.8
2016-08-10 15:06:40 +02:00
BKE_mask.h
Fix missing datablocks types in id_make_local.
2016-07-21 16:54:36 +02:00
BKE_material.h
Depsgraph: tag relations for update when aterial slots changes
2016-08-12 14:59:11 +02:00
BKE_mball_tessellate.h
Metaball tessellation optimization (Octree to BVH)
2015-04-07 13:19:50 +10:00
BKE_mball.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_mesh_mapping.h
Add BKE_mesh_calc_islands_loop_poly_uvmap and use it in new OSD UV subdiv.
2016-07-21 16:54:36 +02:00
BKE_mesh_remap.h
Data Transfer: Add an option to 'auto-transform' destination mesh so that it matches best the source one.
2015-07-13 18:05:38 +02:00
BKE_mesh.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_modifier.h
Merge branch 'master' into blender2.8
2016-05-24 16:48:10 +02:00
BKE_movieclip.h
Add copy/make_local to movieclip datablock.
2016-07-29 23:13:31 +02:00
BKE_multires.h
Move tangents and baking to looptris:
2015-07-30 14:43:58 +02:00
BKE_navmesh_conversion.h
…
BKE_nla.h
NLA: Shift-Tab toggles tweakmode AND makes that track solo
2015-04-14 18:39:02 +12:00
BKE_node.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_object_deform.h
Weight Paint: Make multi-paint & mirror work as if bone selection was symmetric
2016-01-21 08:03:47 +11:00
BKE_object.h
Merge branch 'master' into blender2.8
2016-07-25 15:07:17 +02:00
BKE_ocean.h
Cleanup: unused defines
2015-11-12 18:54:26 +11:00
BKE_outliner_treehash.h
Cleanup: rename treehash -> outliner_treehash
2015-04-07 11:01:47 +10:00
BKE_packedFile.h
Auto pack: don't show "No new files have been packed" on every .blend file save.
2015-05-01 19:20:42 +02:00
BKE_paint.h
Fix T48965: Cannot Append Palette As Local Datablock.
2016-07-28 19:32:36 +02:00
BKE_pbvh.h
Optimize sculpt undo, avoid redundant updates
2016-02-13 18:59:56 +11:00
BKE_property.h
…
BKE_report.h
Cleanup: readfile: cleanup a bit error messages.
2015-11-13 15:26:22 +01:00
BKE_rigidbody.h
Removed DNA for point caches.
2016-04-30 14:20:13 +02:00
BKE_sca.h
Merge branch 'master' into blender2.8
2016-06-23 07:52:58 +10:00
BKE_scene.h
Fix missing datablocks types in id_make_local.
2016-07-21 16:54:36 +02:00
BKE_screen.h
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
2016-06-22 17:53:50 +02:00
BKE_sequencer.h
Fix T49027: Sequence uses too much memory when rendering scene with lots of movie strips
2016-08-09 14:33:00 +02:00
BKE_shrinkwrap.h
Shrink Wrap modifier: invert vgroup option
2016-03-07 11:24:03 +11:00
BKE_sketch.h
Transform Volume rewrite/refactor
2016-05-11 20:20:25 +10:00
BKE_smoke.h
Smoke, Dynamic Paint: de-duplicate object subframe update function.
2016-01-09 04:37:53 +01:00
BKE_softbody.h
Removed all direct uses of BKE_particle.h and DNA_particle_types.h from source/blender/editors.
2016-04-12 13:04:31 +02:00
BKE_sound.h
Fix missing datablocks types in id_make_local.
2016-07-21 16:54:36 +02:00
BKE_speaker.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_subsurf.h
OpenSubdiv: Use pool for delayed OpenGL buffers free when freeing from non-main thread
2015-11-04 21:30:25 +05:00
BKE_suggestions.h
Use BLI_strncasecmp for text suggestions
2015-10-25 17:44:32 +11:00
BKE_text.h
Fix missing datablocks types in id_make_local.
2016-07-21 16:54:36 +02:00
BKE_texture.h
Merge branch 'master' into blender2.8
2016-07-25 15:07:17 +02:00
BKE_tracking.h
Rework 2D stabilizator
2016-08-16 13:30:40 +02:00
BKE_unit.h
Cleanup: use const for units API
2016-05-03 13:52:07 +10:00
BKE_utildefines.h
…
BKE_world.h
Refactor/deduplicate even more make_local code (and fix part of T48907).
2016-07-21 16:54:36 +02:00
BKE_writeavi.h
Multi-View and Stereo 3D
2015-04-06 10:40:12 -03:00
BKE_writeffmpeg.h
Multi-View and Stereo 3D
2015-04-06 10:40:12 -03:00
BKE_writeframeserver.h
Cleanup
2015-04-07 08:46:48 +10:00
CMakeLists.txt
Merge branch 'master' into blender2.8
2016-08-06 12:45:03 +02:00
depsgraph_private.h
Fix depsgraph to compute more accurate links for collision & force.
2016-08-16 15:46:36 +03:00
nla_private.h
…
tracking_private.h
Libmv: Replace region tracker with autotracker in Blender
2014-10-30 23:12:19 +05:00