1a79c6d360
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/blenkernel/intern/blendfile.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/particle.c
2018-06-13 11:02:48 +02:00
67e8c1e1c7
Cleanup: remove more G.main from BKE area.
2018-06-13 10:57:10 +02:00
77879ac038
Fix T55376: instanced collection render visibility ignored.
...
For physics simulation it's still fuzzy though, but this needs bigger
design for how it works with view layers and visibility.
2018-06-12 22:36:43 +02:00
9b9b943e0c
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/blenkernel/BKE_anim.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/armature/pose_utils.c
source/blender/editors/include/ED_armature.h
source/blender/editors/object/object_edit.c
source/blender/editors/transform/transform_conversions.c
2018-06-12 18:26:50 +02:00
2788202417
Cleanup: moar G.main removal from BKE area.
2018-06-12 17:57:24 +02:00
f27ecd56ef
Cleanup: BKE_scene_free should not have to worry about cleaning its usages.
...
This is supposed to be handled by calling code! Henceforce, no need to
call BKE_sequencer_clear_scene_in_allseqs() here, and... no need for
that ugly G.main case. ;)
2018-06-12 17:46:16 +02:00
031416c559
Merge branch 'master' into blender2.8
2018-06-12 17:36:24 +02:00
b00d840359
WM: remove sloppy region type access
...
Avoid accidentally operating on the wrong region type.
2018-06-12 17:34:44 +02:00
760e79d809
WM: rename BKE_regiontype_from_id
...
This returns the first as a fallback, causing confusing usage.
Renamed and added a version of the function that doesn't.
2018-06-12 17:26:38 +02:00
deb3d73eea
Particle: Use loclaized RNG for physics simulation
...
Avoids threading conflicts between multiple particle systems being simulated.
2018-06-12 16:37:40 +02:00
866127d9f2
StudioLight: Use texel size as input size
...
Bettter light distribution for diffuse shading
2018-06-12 16:18:50 +02:00
6231a077ac
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/blenkernel/BKE_group.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_group.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/rigidbody_constraint.c
source/blender/editors/physics/rigidbody_object.c
source/blender/makesrna/intern/rna_group.c
2018-06-12 15:41:32 +02:00
8204261ede
Particle: Remove global RNG usage from distribution
2018-06-12 15:38:29 +02:00
53a9cde038
Particle: Use local RNG during initialization
2018-06-12 15:38:29 +02:00
b6b1e0f56c
T55454: removal of clay engine
...
The ClayEngine was introduced to test the blender2.8 architecture during
development. As currently we have the wanted features implemented with
matcaps we are going to remove the clay engine as it was never intended
to be an official releasable engine
Note: The test cases are never run. But when enabled will be skipped as
they were implemented over the Clay Engine
2018-06-12 15:32:31 +02:00
d72ddb81ae
Studiolight: add rim lighting to the default light setup
2018-06-12 15:17:01 +02:00
a6585fa4b1
Cleanup: moar removal of G.main in BKE area...
2018-06-12 15:16:45 +02:00
d617a6c85b
Cleanup/simplify G.main usages.
...
Using G.main only to get main bled filepath, or built-in fonts, is OK.
So now using the 'valid' G_MAIN macro here instead.
2018-06-12 15:03:51 +02:00
18ae64858b
Cleanup: Indentation
2018-06-12 14:43:40 +02:00
c2abb6d3fc
Particles: Use local RNG
...
Currently only obvious cases, but is already a progress.
2018-06-12 14:30:50 +02:00
49b39ea851
Duplication: Use local RNG
...
Makes generation safe for threading.
2018-06-12 14:30:50 +02:00
3b2e19cb4c
Depsgraph: Ensure modifiers evaluation doesn't happen on top evaluated mesh
2018-06-12 14:30:50 +02:00
c279592123
Depsgraph: Don't update derived mesh for particles on render
...
Render depsgraph is evaluated from scratch, so it should not be needed
to do such a call.
This also prevents modifier stack from being evaluated on top of already
evaluated mesh
2018-06-12 14:30:50 +02:00
43eebdfebd
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/collada/DocumentImporter.cpp
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_modifier.c
2018-06-12 12:58:31 +02:00
be57cf9b2a
Cleanup: remove moar G.main from BKE area.
2018-06-12 12:53:27 +02:00
c98b2e74df
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
2018-06-12 12:38:54 +02:00
5508b572ea
Cleanup: remove some G.main from ED's animsys.
...
The easy ones - there some much, much trickier to tackle there...
2018-06-12 12:28:14 +02:00
ab0daa1866
Studiolight: Disabled irradiance icons
2018-06-12 11:53:34 +02:00
8cca1abcb1
Studiolight: Bumped the radiance buffer to RGBA16F
...
Fixes issue reported at
https://devtalk.blender.org/t/lookdev-ibl-result/890/3
2018-06-12 11:51:04 +02:00
e1f24a8615
Studiolight: cache irradiance buffer
2018-06-12 11:51:04 +02:00
75bcb70c60
Cleanup: remove some G.main from BKE area.
2018-06-12 11:21:54 +02:00
1dc93f90a0
Cleanup: remove image->bindcode, always wrap in GPUTexture.
...
This simplifies code, and will hopefully make UDIM usage of GPUTexture
a little easier.
2018-06-11 23:24:04 +02:00
1d111cd046
Revert "Cleanup: remove image->bindcode, always wrap in GPUTexture."
...
This reverts commit 8242a5bc85
2018-06-11 22:35:09 +02:00
8242a5bc85
Cleanup: remove image->bindcode, always wrap in GPUTexture.
2018-06-11 22:30:59 +02:00
3816502b7c
Drivers: ensure Python expressions are cached with copy-on-write.
...
Store the compiled expressions on the original driver.
Ref T55442.
2018-06-11 21:34:21 +02:00
9520fc0ff7
Pose: optimize pose rebuild for copy-on-write.
...
Ref T55442.
2018-06-11 20:48:18 +02:00
c31bc465ea
Revert previous commit and do proper fix for missing typeinfo in nodes.
2018-06-11 17:39:39 +02:00
faf7453b45
Fix crash in loading/applying static overrides of some nodal material.
...
No real idea why node's typeinfo is NULL here... but think we do not
care much in that case, so just adding some NULL checks for now.
2018-06-11 17:12:47 +02:00
05111d79d0
Cleanup: remove unused DAG_EVAL_PREVIEW mode.
2018-06-11 17:06:28 +02:00
73b9531dcf
Fix incorrect object selection test in outliner and rigid body.
2018-06-11 17:06:28 +02:00
204c167c72
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_convert.c
source/blender/editors/interface/interface_eyedropper_color.c
source/blender/editors/object/object_add.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_image.c
source/blender/windowmanager/intern/wm_draw.c
2018-06-11 16:02:46 +02:00
9e439197ed
Workbench: API Changes
...
- merged matcap and studioLight api
2018-06-11 15:54:24 +02:00
78a8d3685b
Cleanup: remove moar ugly G.main usages...
...
BKE_image was an ugly nest, could fix all but the ones from compositor,
so moved ugly G.main there, at least we know where the Evil is that way ;)
2018-06-11 15:40:37 +02:00
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
d0956e9cb3
Cleanup: Moar G.main removal of Hell.
...
This commit actually adds some G.main... but at much, much higher level
than the ones it removes, so should still be better ;)
2018-06-11 12:15:14 +02:00
8055ed2741
Cleanup: remove some G.main usages...
2018-06-11 12:15:14 +02:00
f2e60b53a7
Fix pchan head/tail original values not being set
2018-06-11 11:37:22 +02:00
4ac87d58eb
Merge branch 'master' into blender2.8
2018-06-11 11:06:43 +02:00
28c34ae7e2
Cleanup: Use BLI_strncpy
...
It has behavior which we expect, and silences strict compiler warning.
2018-06-11 11:06:15 +02:00
419a813938
Merge branch 'master' into blender2.8
2018-06-09 18:48:11 +02:00
