archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
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.
Files
069569f82011c833937df07ec7945751c02f0a9c
blender-archive/source/blender/blenkernel/intern
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
..
action.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
addon.c
Add missing newlines for debug prints
2015-11-16 15:19:30 +11:00
anim_sys.c
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
anim.c
Merge branch 'master' into blender2.8
2016-06-21 12:14:49 +10:00
appdir.c
Refactor BKE_blender into separate headers
2016-04-25 19:27:45 +10:00
armature_update.c
Cleanup: spelling
2016-07-16 17:48:57 +10:00
armature.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
autoexec.c
Fix T48111: Auto-run fails w/ empty paths
2016-06-03 15:28:32 +10:00
blender_copybuffer.c
Refactor BKE_blender into separate headers
2016-04-25 19:27:45 +10:00
blender_undo.c
Cleanup: remove bad-level call
2016-06-25 21:19:54 +10:00
blender.c
BKE_blender: Add own atexit functions
2016-06-24 10:05:18 +10:00
blendfile.c
Fix T48416: Impossible to copy a linked object from a file to another one mantaining the linked library.
2016-05-13 14:12:10 +02:00
bmfont.c
…
bpath.c
Merge branch 'master' into blender2.8
2016-08-06 12:45:03 +02:00
brush.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
bullet.c
…
bvhutils.c
Transform Snap: Optimize edge-snap using BVH tree
2016-06-30 17:52:03 +10:00
cachefile.c
Basic Alembic support
2016-08-06 10:58:13 +02:00
camera.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
CCGSubSurf_inline.h
…
CCGSubSurf_intern.h
OpenSubdiv: Properly respect Subdivide UVs option
2016-07-22 17:53:00 +02:00
CCGSubSurf_legacy.c
Fix T46851: Crash on multires more than million
2015-11-24 15:25:19 +05:00
CCGSubSurf_opensubdiv_converter.c
OpenSubdiv: Properly respect Subdivide UVs option
2016-07-22 17:53:00 +02:00
CCGSubSurf_opensubdiv.c
OpenSubdiv: Properly respect Subdivide UVs option
2016-07-22 17:53:00 +02:00
CCGSubSurf_util.c
Cleanup: spelling
2016-07-16 17:48:57 +10:00
CCGSubSurf.c
OpenSubdiv: Properly respect Subdivide UVs option
2016-07-22 17:53:00 +02:00
CCGSubSurf.h
OpenSubdiv: Properly respect Subdivide UVs option
2016-07-22 17:53:00 +02:00
cdderivedmesh.c
Fix T49105: Array modifier displayed in Edit mode crashes on selection, with End Cap enabled.
2016-08-19 17:00:34 +02:00
cloth.c
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
collision.c
Fix depsgraph to compute more accurate links for collision & force.
2016-08-16 15:46:36 +03:00
colortools.c
Support Auto-Clamped Handle for Curve-Mapping
2016-08-01 09:06:40 +10:00
constraint.c
Basic Alembic support
2016-08-06 10:58:13 +02:00
context.c
Merge branch 'master' into blender2.8
2016-08-06 12:45:03 +02:00
crazyspace.c
EditMesh: Avoid creating deform-vert layer every redraw
2016-06-22 21:31:00 +10:00
curve.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
customdata_file.c
…
customdata.c
Cleanup - size_t is unsigned, so always >= 0!
2016-06-07 21:53:17 +02:00
data_transfer_intern.h
…
data_transfer.c
Add BKE_mesh_calc_islands_loop_poly_uvmap and use it in new OSD UV subdiv.
2016-07-21 16:54:36 +02:00
deform.c
Fix group flipping when syncing mirror weights
2016-02-09 00:19:28 +11:00
depsgraph.c
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
DerivedMesh.c
EditMesh: Avoid creating deform-vert layer every redraw
2016-06-22 21:31:00 +10:00
displist.c
Fix T48723: Curve bevel creates invalid geometry
2016-06-25 13:57:35 +10:00
dynamicpaint.c
Fix T49004 and motion blur of cloth, softbody, etc past the end frame.
2016-08-11 13:36:29 +03:00
editderivedmesh.c
EditMesh: Avoid creating deform-vert layer every redraw
2016-06-22 21:31:00 +10:00
editmesh_bvh.c
Cleanup: rename getepsilon -> get_epsilon
2016-05-06 06:14:36 +10:00
editmesh.c
Cleanup: use BM_mesh_* prefix for BMesh functions
2016-01-14 13:00:11 +11:00
effect.c
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
fcurve.c
Py-Driver: add 'self' option
2016-07-30 16:46:13 +10:00
fluidsim.c
Removed particle DNA.
2016-04-13 13:41:11 +02:00
fmodifier.c
…
font.c
Fix missing datablocks types in id_make_local.
2016-07-21 16:54:36 +02:00
freestyle.c
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library.
2015-11-09 21:00:53 +01:00
gpencil.c
Cleanup/security fix: do not use strcpy (at least in new code).
2016-08-18 16:06:11 +02:00
group.c
Merge branch 'master' into blender2.8
2016-07-28 12:00:58 +10:00
icons.c
Fix (IRC reported by Sergey) assert regarding icon_id of newly copied datablocks.
2016-07-19 16:27:40 +02:00
idcode.c
Merge branch 'master' into blender2.8
2016-08-10 15:06:40 +02:00
idprop.c
PyAPI: Add PyC_UnicodeAsByteAndSize
2016-07-31 16:52:44 +10:00
image_gen.c
Multi-thread generated image creation
2016-05-05 23:47:22 +02:00
image.c
Fix T49014: Append does not work in some cases.
2016-08-05 14:48:22 +02:00
ipo.c
Removed the ID_PA code used for ParticleSettings.
2016-04-16 11:29:28 +02:00
key.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
lamp.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
lattice.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
library_idmap.c
Cleanup: style, whitespace, doxy filepaths
2016-06-19 06:33:29 +10:00
library_query.c
Merge branch 'master' into blender2.8
2016-08-06 12:57:21 +02:00
library_remap.c
Merge branch 'master' into blender2.8
2016-08-06 12:45:03 +02:00
library.c
Merge branch 'master' into blender2.8
2016-08-10 15:06:40 +02:00
linestyle.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
mask_evaluate.c
Cleanup: rename line to segments, avoids confusion
2015-11-13 07:48:05 +11:00
mask_rasterize.c
…
mask.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
material.c
Depsgraph: tag relations for update when aterial slots changes
2016-08-12 14:59:11 +02:00
mball_tessellate.c
Cleanup: comment blocks
2016-07-02 10:08:33 +10:00
mball.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
mesh_evaluate.c
Fix T48986: Incorrect normals or tangents when using custom split normals.
2016-08-02 16:08:00 +02:00
mesh_mapping.c
Cleanup: debug-only variable.
2016-07-25 09:31:56 +02:00
mesh_remap.c
Fix (unreported) memleak in mesh remapping auto-transform code.
2015-12-30 21:11:07 +01:00
mesh_validate.c
C99/C++11: replace deprecated finite() by isfinite().
2016-05-17 21:39:16 +02:00
mesh.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
modifier.c
Merge branch 'master' into blender2.8
2016-07-12 00:07:44 +02:00
modifiers_bmesh.c
BMesh: make toolflags optional
2016-07-01 19:29:22 +10:00
movieclip.c
Rework 2D stabilizator
2016-08-16 13:30:40 +02:00
multires.c
Cleanup: style
2016-01-19 04:54:39 +11:00
navmesh_conversion.c
…
nla.c
Cleanup/Refactor: pass Main pointer to all ID copy functions.
2016-07-10 14:52:00 +02:00
node.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
object_deform.c
Removed particle DNA.
2016-04-13 13:41:11 +02:00
object_dupli.c
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
object_update.c
Merge branch 'master' into blender2.8
2016-07-18 19:25:44 +10:00
object.c
Merge branch 'master' into blender2.8
2016-07-28 12:00:58 +10:00
ocean.c
Cleanup: BLI_task - API changes.
2016-01-16 15:59:37 +01:00
outliner_treehash.c
…
packedFile.c
Replace of (id->lib != NULL) check by meaningful macro.
2016-07-06 14:11:01 +02:00
paint.c
Fix T48965: Cannot Append Palette As Local Datablock.
2016-07-28 19:32:36 +02:00
pbvh_bmesh.c
Cleanup: line length
2016-07-11 23:06:14 +10:00
pbvh_intern.h
Cleanup: redundant 4th index in sculpt PBVH
2016-07-06 19:15:47 +10:00
pbvh.c
Fix sculpting high poly meshes
2016-07-11 17:17:08 +10:00
property.c
…
report.c
Cleanup: readfile: cleanup a bit error messages.
2015-11-13 15:26:22 +01:00
rigidbody.c
Fix T49004 and motion blur of cloth, softbody, etc past the end frame.
2016-08-11 13:36:29 +03:00
sca.c
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
2016-06-22 17:53:50 +02:00
scene.c
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
screen.c
ID-Remap - Step one: core work (cleanup and rework of generic ID datablock handling).
2016-06-22 17:53:50 +02:00
seqcache.c
…
seqeffects.c
Consolidate multiple checks for out->rect_float in prepare_effect_imbufs()
2016-07-14 14:17:54 +02:00
seqmodifier.c
Fix white balance sequencer modifier
2016-02-23 14:54:42 +11:00
sequencer.c
Fix T48916: Proxy Custom File is broken
2016-08-09 14:58:34 +02:00
shrinkwrap.c
Fix T48695: Slowdown w/ edit-mesh & shrinkwrap
2016-06-29 19:43:08 +10:00
sketch.c
Transform Volume rewrite/refactor
2016-05-11 20:20:25 +10:00
smoke.c
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
softbody.c
Merge branch 'master' into blender2.8
2016-08-21 13:18:26 +02:00
sound.c
Fix missing datablocks types in id_make_local.
2016-07-21 16:54:36 +02:00
speaker.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
subsurf_ccg.c
Fix T49090: color picking draws wrong when using subsurf in material draw mode.
2016-08-19 23:20:24 +02:00
suggestions.c
Use BLI_strncasecmp for text suggestions
2015-10-25 17:44:32 +11:00
text.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
texture.c
Merge branch 'master' into blender2.8
2016-07-28 12:00:58 +10:00
tracking_auto.c
Tracking: Fix possible cases when tracker will try tracking failed tracks
2016-07-21 16:54:18 +02:00
tracking_detect.c
…
tracking_plane_tracker.c
…
tracking_region_tracker.c
…
tracking_solver.c
…
tracking_stabilize.c
2D stabilizer: Use exact getter instead of regular one followed with frame check
2016-08-17 10:49:42 +02:00
tracking_util.c
fix null pointer dereferences
2016-07-21 18:16:08 -04:00
tracking.c
2D stabilizer: Revert majority of UI change
2016-08-16 14:25:55 +02:00
unit.c
Cleanup: use const for units API
2016-05-03 13:52:07 +10:00
world.c
Cleanup: factorize the 'ensure local' part of datablock copy into a single BKE_id_copy_ensure_local function.
2016-07-25 16:16:35 +02:00
writeavi.c
Fix T46565: Movie render crash w/o permissions
2015-10-22 17:25:37 +11:00
writeffmpeg.c
More fixes from coverity report.
2016-08-16 18:19:52 +02:00
writeframeserver.c
…