griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
160cb9a28477ccd1d8bdbf5265464dfdbea09d2c
test2/source/blender/blenkernel/intern
History
Bastien Montagne 160cb9a284 Merge branch 'master' into blender2.8 
Conflicts:
	intern/cycles/blender/blender_object.cpp
	source/blender/alembic/intern/abc_exporter.cc
	source/blender/alembic/intern/abc_mball.cc
	source/blender/alembic/intern/abc_mball.h
	source/blender/blenkernel/BKE_anim.h
	source/blender/blenkernel/BKE_displist.h
	source/blender/blenkernel/BKE_dynamicpaint.h
	source/blender/blenkernel/BKE_group.h
	source/blender/blenkernel/BKE_mball.h
	source/blender/blenkernel/BKE_mball_tessellate.h
	source/blender/blenkernel/BKE_object.h
	source/blender/blenkernel/BKE_scene.h
	source/blender/blenkernel/intern/anim.c
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/displist.c
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/group.c
	source/blender/blenkernel/intern/mball.c
	source/blender/blenkernel/intern/mball_tessellate.c
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/object_dupli.c
	source/blender/blenkernel/intern/object_update.c
	source/blender/blenkernel/intern/pointcache.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/smoke.c
	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/editors/include/ED_object.h
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_edit.c
	source/blender/editors/object/object_modifier.c
	source/blender/editors/physics/dynamicpaint_ops.c
	source/blender/editors/sculpt_paint/paint_vertex.c
	source/blender/editors/sculpt_paint/sculpt_uv.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/editors/transform/transform_snap_object.c
	source/blender/editors/util/ed_util.c
	source/blender/gpu/intern/gpu_material.c
	source/blender/makesrna/intern/rna_meta.c
	source/blender/makesrna/intern/rna_object_api.c
	source/blender/modifiers/intern/MOD_dynamicpaint.c
	source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-11 14:39:38 +02:00
..
action.c
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
addon.c
Cleanup: style
2018-02-15 11:13:54 +11:00
anim_sys.c
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
anim.c
Cleanup: Moar G.main removal of Hell.
2018-06-11 12:15:14 +02:00
appdir.c
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
armature_update.c
Fix pchan head/tail original values not being set
2018-06-11 11:37:22 +02:00
armature.c
Fix T55165: Driving camera lens with property behaves unexpectedly
2018-05-25 12:48:33 +02:00
autoexec.c
…
blender_copybuffer.c
Collections and groups unification
2018-05-18 13:34:24 +02:00
blender_undo.c
Merge branch 'master' into blender2.8
2018-06-06 09:39:35 +02:00
blender.c
Remove ViewLayer settings - cleanup 1/2
2018-05-16 23:13:28 +02:00
blendfile.c
Merge branch 'master' into blender2.8
2018-06-05 17:02:50 +02:00
bmfont.c
Cleanup: order BLI before BKE headers
2017-11-14 17:23:40 +11:00
boids.c
Depsgraph: remove EvaluationContext, pass Depsgraph instead.
2018-04-16 19:55:33 +02:00
bpath.c
Merge branch 'master' into blender2.8
2018-06-05 17:02:50 +02:00
brush.c
Cleanup: unused functions
2018-06-09 18:47:39 +02:00
bvhutils.c
Moved function declarations from BKE_mesh.h → BKE_mesh_runtime.h
2018-06-05 16:59:18 +02:00
cachefile.c
Alembic: Moved a BLI_assert
2018-06-08 15:51:49 +02:00
camera.c
Cleanup: remove G.main from BKE object
2018-05-31 12:27:47 +02:00
CCGSubSurf_inline.h
…
CCGSubSurf_intern.h
…
CCGSubSurf_legacy.c
Nuke OMP usage in multires.c.
2018-01-11 19:39:24 +01:00
CCGSubSurf_opensubdiv_converter.c
…
CCGSubSurf_opensubdiv.c
Fix compiler warnings.
2018-05-13 14:48:55 +02:00
CCGSubSurf_util.c
…
CCGSubSurf.c
Replace CGSubSurf direct includes to GL/glew.h
2017-04-07 13:03:31 +02:00
CCGSubSurf.h
Nuke OMP usage in multires.c.
2018-01-11 19:39:24 +01:00
cdderivedmesh.c
Add check in BKE_pbvh_apply_vertCos that number of deforming cos matches number of pbvh vertices.
2018-06-08 15:43:57 +02:00
cloth.c
Moved function declarations from BKE_mesh.h → BKE_mesh_runtime.h
2018-06-05 16:59:18 +02:00
collection.c
Depsgraph: Ensure collections are up to date after modifications
2018-06-07 14:41:29 +02:00
collision.c
Collections and groups unification
2018-05-18 13:34:24 +02:00
colorband.c
Cleanup: use '_len' instead of '_size' w/ BLI API
2018-02-15 23:39:08 +11:00
colortools.c
Cleanup: trailing whitespace (comment blocks)
2018-06-01 18:19:39 +02:00
constraint.c
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
context.c
Collections and groups unification
2018-05-18 13:34:24 +02:00
crazyspace.c
Extract common modifier parameters into ModifierEvalContext struct
2018-05-01 18:02:17 +02:00
curve_decimate.c
Cleanup: use '_len' instead of '_size' w/ BLI API
2018-02-15 23:39:08 +11:00
curve.c
Fix T55031: add explicit copy flag to force deep-copying shapekey datablock with 'parent' one.
2018-05-14 14:25:13 +02:00
customdata_file.c
Fix buffer overflow vulnerabilities in mesh code.
2018-01-18 00:54:07 +01:00
customdata.c
Cleanup: use 'e' prefix for enum types
2018-05-30 10:29:41 +02:00
data_transfer_intern.h
Cleanup: trailing whitespace (comment blocks)
2018-06-01 18:19:39 +02:00
data_transfer.c
Moved function declarations from BKE_DerivedMesh.h to BKE_mesh_runtime.h
2018-06-05 16:59:25 +02:00
deform.c
Merge branch 'master' into blender2.8
2018-01-10 19:58:05 +11:00
DerivedMesh.c
mesh_get_eval_final() should check ob->runtime.mesh_eval
2018-06-08 15:51:49 +02:00
displist.c
Merge branch 'master' into blender2.8
2018-06-11 14:39:38 +02:00
dynamicpaint.c
Merge branch 'master' into blender2.8
2018-06-11 14:39:38 +02:00
editderivedmesh.c
Modifiers: Simple Deform & Build, DerivedMesh → Mesh
2018-05-01 18:02:17 +02:00
editlattice.c
Cleanup: split lattice into own library
2018-03-19 15:45:50 +01:00
editmesh_bvh.c
Depsgraph: remove EvaluationContext, pass Depsgraph instead.
2018-04-16 19:55:33 +02:00
editmesh_tangent.c
Depsgraph: remove EvaluationContext, pass Depsgraph instead.
2018-04-16 19:55:33 +02:00
editmesh.c
Multi-Object Editing
2018-04-16 17:56:50 +02:00
effect.c
Cloth Modifier: get time from depsgraph instead of scene
2018-05-22 17:08:57 +02:00
fcurve.c
Cleanup: trailing whitespace (comment blocks)
2018-06-01 18:19:39 +02:00
fluidsim.c
Depsgraph: remove EvaluationContext, pass Depsgraph instead.
2018-04-16 19:55:33 +02:00
fmodifier.c
Cleanup: trailing whitespace (comment blocks)
2018-06-01 18:19:39 +02:00
font.c
Merge branch 'master' into blender2.8
2018-06-05 17:02:50 +02:00
freestyle.c
Collections and groups unification
2018-05-18 13:34:24 +02:00
gpencil.c
Refactor ID copying (and to some extent, ID freeing).
2017-08-07 20:34:36 +02:00
icons_rasterize.c
Revert "UI: geometry-icon alpha blend over existing colors"
2018-05-13 15:39:10 +02:00
icons.c
EEvEE: LookDev
2018-05-28 17:07:39 +02:00
idcode.c
Collections and groups unification
2018-05-18 13:34:24 +02:00
idprop_utils.c
IDProp API: use stored string length for IDP_repr
2018-05-06 08:57:19 +02:00
idprop.c
Merge branch 'master' into blender2.8
2018-05-05 14:42:15 +02:00
image_gen.c
Fix a few harmless maybe uninitialized warnings with GCC 5.4.
2017-07-21 00:54:58 +02:00
image.c
Merge branch 'master' into blender2.8
2018-06-05 17:02:50 +02:00
ipo.c
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
key.c
Make GS macro return proper IDType type
2017-08-28 11:21:55 +02:00
lamp.c
Cleanup: unused DNA
2018-05-18 08:14:36 +02:00
lattice.c
Fix crash when making objects to share same mesh
2018-06-04 15:17:16 +02:00
layer_utils.c
Multi-Object Editing
2018-04-16 17:56:50 +02:00
layer.c
Fix T55126: COW problem: there is an active object even if unselectable
2018-06-07 16:31:10 +02:00
library_idmap.c
…
library_override.c
Static Override: fix stupid ;istake in moving autooverride to own struct flag.
2018-05-04 15:44:19 +02:00
library_query.c
Fix T55062: crash with workspace scene relations.
2018-05-25 15:06:40 +02:00
library_remap.c
Merge branch 'master' into blender2.8
2018-05-29 16:02:53 +02:00
library.c
Merge branch 'master' into blender2.8
2018-06-11 14:39:38 +02:00
lightprobe.c
Eevee: Probes: Add support for intensity tweak.
2018-01-21 23:16:59 +01:00
linestyle.c
Workspaces: active view layer now always comes from workspace, not scene.
2018-04-26 17:06:14 +02:00
mask_evaluate.c
Depsgraph: Allow per-depsgraph debug flags
2018-05-02 17:09:44 +02:00
mask_rasterize.c
Task scheduler: Use const qualifier in callbacks for parallel range
2018-01-10 12:53:59 +01:00
mask.c
Merge branch 'master' into blender2.8
2018-04-01 11:03:25 +02:00
material.c
DRW: Fix animated material not refreshing
2018-06-08 16:29:33 +02:00
mball_tessellate.c
Merge branch 'master' into blender2.8
2018-06-11 14:39:38 +02:00
mball.c
Cleanup: Moar G.main removal of Hell.
2018-06-11 12:15:14 +02:00
mesh_convert.c
Cleanup: Moar G.main removal of Hell.
2018-06-11 12:15:14 +02:00
mesh_evaluate.c
Modifiers: ported curve_calc_modifiers_post() internals from DerivedMesh → Mesh
2018-06-06 10:11:31 +02:00
mesh_mapping.c
Cleanup: redundant casts
2017-10-20 14:03:22 +11:00
mesh_merge.c
Cleanup: use 'nomain' when not in library data
2018-05-08 17:06:30 +02:00
mesh_remap.c
BKE: bvhuils: remove member sphere_radius.
2018-05-04 11:57:01 -03:00
mesh_runtime.c
Cleanup: rename WITH -> USE for internal defines
2018-06-06 09:29:54 +02:00
mesh_tangent.c
Cleanup: indentation
2018-04-16 18:24:38 +02:00
mesh_validate.c
Add BKE_mesh_is_valid
2018-05-16 06:07:50 -04:00
mesh.c
Ensure BKE_mesh_new_nomain_from_template() always has valid mxxx pointers
2018-06-06 12:27:25 +02:00
modifier.c
Merge branch 'master' into blender2.8
2018-06-09 15:18:21 +02:00
modifiers_bmesh.c
Fix T54096: Subdivision Surface + Boolean Modifiers + Transform = crash
2018-02-19 16:16:56 +01:00
movieclip.c
Merge branch 'master' into blender2.8
2018-06-05 17:02:50 +02:00
multires.c
Moved function declarations from BKE_DerivedMesh.h to BKE_mesh_runtime.h
2018-06-05 16:59:25 +02:00
nla.c
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00
node.c
Depsgraph: Remove no longer needed nodetree values copying on eval
2018-06-08 17:52:49 +02:00
object_deform.c
Merge branch 'master' into blender2.8
2018-03-06 19:13:41 +11:00
object_dupli.c
Merge branch 'master' into blender2.8
2018-06-11 14:39:38 +02:00
object_facemap.c
Cleanup: trailing spaces
2018-04-22 08:45:52 +02:00
object_update.c
Merge branch 'master' into blender2.8
2018-06-11 14:39:38 +02:00
object.c
Cleanup: Moar G.main removal of Hell.
2018-06-11 12:15:14 +02:00
ocean.c
Cleanup: rename BLI_thread.h API
2018-02-16 01:13:46 +11:00
outliner_treehash.c
Fix T55226: outliner glitch with item open/close, after recent optimization.
2018-05-28 17:10:00 +02:00
packedFile.c
Cleanup: use new accessors to blendfile path (Main.name).
2018-06-05 16:33:46 +02:00
paint.c
Merge branch 'master' into blender2.8
2018-06-11 14:39:38 +02:00
particle_child.c
Remove Blender Internal and legacy viewport from Blender 2.8.
2018-04-19 17:35:25 +02:00
particle_distribute.c
Fix T55207, fix T55208: hair not positioned correctly after subsurf.
2018-05-25 23:20:20 +02:00
particle_system.c
Particle mode: Support children drawing
2018-06-07 11:31:56 +02:00
particle.c
Particle edit: Simplify code by benefiting from single edit context
2018-06-07 11:31:56 +02:00
pbvh_bmesh.c
Cleanup: rename BMesh count_ex -> count_at_most
2018-04-03 17:06:36 +02:00
pbvh_intern.h
Sculpting: Sdd an option to hide mask in viewport
2018-01-15 11:43:59 +01:00
pbvh.c
Add check in BKE_pbvh_apply_vertCos that number of deforming cos matches number of pbvh vertices.
2018-06-08 15:43:57 +02:00
pointcache.c
Cleanup: Moar G.main removal of Hell.
2018-06-11 12:15:14 +02:00
report.c
…
rigidbody.c
Cleanup: style
2018-06-06 22:17:06 +02:00
scene.c
Merge branch 'master' into blender2.8
2018-06-11 14:39:38 +02:00
screen.c
UI: add subpanel support.
2018-06-03 21:30:35 +02:00
seqcache.c
…
seqeffects.c
Cleanup: style
2018-06-06 22:17:06 +02:00
seqmodifier.c
Cleanup: rename char/float conversion functions
2018-05-07 17:51:40 +02:00
sequencer.c
Cleanup: getting rid of G.main.
2018-06-08 12:17:22 +02:00
shrinkwrap.c
Cleanup/fix wrong modifiers targets handling in COW context.
2018-05-30 12:04:06 +02:00
smoke.c
Merge branch 'master' into blender2.8
2018-06-11 14:39:38 +02:00
softbody.c
Collections and groups unification
2018-05-18 13:34:24 +02:00
sound.c
Merge branch 'master' into blender2.8
2018-06-05 17:02:50 +02:00
speaker.c
Cleanup: remove global header
2018-04-01 07:24:45 +02:00
studiolight.c
Studiolight: Segment when using float based matcaps
2018-06-08 12:11:05 +02:00
subsurf_ccg.c
Add check in BKE_pbvh_apply_vertCos that number of deforming cos matches number of pbvh vertices.
2018-06-08 15:43:57 +02:00
suggestions.c
Cleanup: Use BLI_strncpy
2018-06-11 11:06:15 +02:00
text.c
Merge branch 'master' into blender2.8
2018-06-11 11:06:43 +02:00
texture.c
Remove Blender Internal and legacy viewport from Blender 2.8.
2018-04-19 17:35:25 +02:00
tracking_auto.c
Task scheduler: Use const qualifier in callbacks for parallel range
2018-01-10 12:53:59 +01:00
tracking_detect.c
…
tracking_plane_tracker.c
…
tracking_region_tracker.c
Cleanup: typos
2018-02-26 19:58:31 +11:00
tracking_solver.c
…
tracking_stabilize.c
Task scheduler: Use const qualifier in callbacks for parallel range
2018-01-10 12:53:59 +01:00
tracking_util.c
Cleanup: rename BLI_thread.h API
2018-02-16 01:13:46 +11:00
tracking.c
Use correct time for curve parent evaluation
2018-05-29 17:05:32 +02:00
undo_system.c
Merge branch 'master' into blender2.8
2018-06-07 13:41:32 +02:00
unit.c
Fix multi-units drawing re precision handling.
2017-08-01 16:42:35 +02:00
workspace.c
Depsgraph: Consider depsgraphs used by workspace as active
2018-05-31 18:07:55 +02:00
world.c
Don't tag UBO as dirty anymore otherwise it still crashes on render
2018-06-07 19:19:39 +02:00
writeavi.c
Merge branch 'master' into blender2.8
2018-06-05 17:02:50 +02:00
writeffmpeg.c
Merge branch 'master' into blender2.8
2018-06-05 17:02:50 +02:00