Germano
8f5e7c3fa9
Merge branch 'master' into blender2.8
2017-11-10 13:02:49 -02:00
Germano
d95eabf0a9
mball_tessellate: Simplify face creation
...
Faces that have the last two indices equal are considered triangles, and not those that the last index is 0
Improvement of 7% in performance of the `polygonize` function
2017-11-10 12:58:34 -02:00
Dalai Felinto
34c99ee85b
Fixup for doversion/layers: disable collections for scene layers
2017-11-10 11:27:30 -02:00
Dalai Felinto
2ec01cc7c5
Layers doversion: Handle hide and hide_render objects
...
We now created nested collections for the original Collection 1, 2 ...
collections for the "hide" and "hide_render" objects.
Also, remove logic for rename single-collection files, it's now kept as
it was originally (Collection 1, Collection 5, ...).
Thanks Sergey Sharybin and Pablo Vazquez for patch review and suggestions.
2017-11-10 10:37:23 -02:00
Sergey Sharybin
7922b62519
Workaround crash rendering font objects
...
Needs a proper scene layer and dependency graph, which we do not have
yet during render pipeline.
2017-11-10 11:09:10 +01:00
Bastien Montagne
7a6ad2901c
Merge branch 'master' into blender2.8
2017-11-10 10:13:19 +01:00
Dalai Felinto
7defb27f08
Farewell BaseLegacy
...
Finally, bases are all using the latest, newest SceneLayer bases.
2017-11-09 15:45:19 -02:00
Dalai Felinto
06a7db85bc
BGE cleanup: remove Base from KX_Light.h
2017-11-09 15:45:19 -02:00
Sergey Sharybin
3dde21f97e
Depsgraph: Fix broken copy-on-write draw after ownership changes
...
Need to build layer collections callbacks using proper CoW pointer.
2017-11-09 16:42:54 +01:00
Dalai Felinto
cec7f1215a
Rename Scene macros back to their original _NEW less names
2017-11-09 13:35:46 -02:00
Dalai Felinto
c35f1d05ea
Farewell Scene->basact
2017-11-09 13:23:41 -02:00
Sergey Sharybin
09d26cab0b
Cleanup: Use full name for scene_layer in alembic
2017-11-09 15:45:21 +01:00
Sergey Sharybin
a956e7399a
Cleanup: Use full name for scene_layer in blenloader
2017-11-09 15:45:21 +01:00
Sergey Sharybin
a6951df836
Cleanup: Use full name for scene_layer in depsgraph
2017-11-09 15:45:21 +01:00
Sergey Sharybin
240b8b9679
Cleanup: Use full name for scene_layer in draw
2017-11-09 15:45:21 +01:00
Sergey Sharybin
acd811278e
Cleanup: Use full name for scene_layer in gpu
2017-11-09 15:45:21 +01:00
Sergey Sharybin
2466afd089
Cleanup: Use full name for scene_layer in makesrna
2017-11-09 15:45:21 +01:00
Sergey Sharybin
859417c657
Cleanup: Use full name for scene_layer in nodes
2017-11-09 15:45:21 +01:00
Sergey Sharybin
f7398bc0f3
Cleanup: Use full name for scene_layer in python
2017-11-09 15:45:21 +01:00
Sergey Sharybin
e5081a0dae
Cleanup: Use full name for scene_layer in render
2017-11-09 15:45:21 +01:00
Sergey Sharybin
bd6ab7dd6c
Cleanup: Use full name for scene_layer in windowmanager
2017-11-09 15:45:21 +01:00
Julian Eisel
98fc7f6b53
Remove unused screen-name storage in window
...
Checked in really old revisions, seems like this was never used. So
doesn't matter for compatibility either (tested opening files saved with
this in 2.49).
2017-11-09 15:11:57 +01:00
Julian Eisel
fadbb2fde8
Fix crash using pre 2.5 file as startup.blend
2017-11-09 15:11:57 +01:00
Julian Eisel
5839c73a54
Cleanup: Refactor window matching after file read for readability
...
Code should hopefully be much clearer now.
Also removing code that's been commented out for a while, and was never
executed in master.
2017-11-09 15:11:57 +01:00
Stefan Werner
df886b178c
Moved alignment attributes from my last commit to BLI_compiler_attrs.h for future use.
2017-11-09 14:59:31 +01:00
Stefan Werner
83d9f8e379
Compositor: Ensured 16 byte alignment for variables accessed by SSE instructions.
...
Before this patch, the XBlur/YBlur compositor nodes would crash for me when run in a MSVC 2015 debug build (test scene: BMW27_cpu). I added the compiler instructions to explicitly align the local variables that the SSE instructions are accessing.
2017-11-09 14:38:17 +01:00
Sergey Sharybin
92020077e6
Depsgraph: Pass CoW pointer to ID datablocks evaluation functions
...
The only remaining part is the particle stuff, which needs a pointer to exact
particle system which does not exist yet. Leaving it for later a bit for until
it's more clear what do we do with particles.
Unless i'm mistaken, we've got all proper CoW pointers bound now.
2017-11-09 13:56:43 +01:00
Sergey Sharybin
ec0e35f178
Depsgraph: Cleanup, make it more clear what layer is
2017-11-09 11:52:13 +01:00
Sergey Sharybin
e30972deae
Depsgraph: Cleanup
2017-11-09 11:43:41 +01:00
Sergey Sharybin
0ad54b5ba3
Depsgraph: Only build collections for current graph scene layer
2017-11-09 11:43:41 +01:00
Dalai Felinto
f30086b5b6
Merge branch 'master' into blender2.8
2017-11-09 08:32:20 -02:00
Dalai Felinto
ee49ee24c3
Fix: unselectable objects can be selected via the NLA editor
...
This is not reported anywhere, but it's easy to reproduce. I ran into this
while updating this code for the blender2.8 branch.
2017-11-09 08:27:38 -02:00
Sergey Sharybin
f2b4a59be6
Depsgraph: Cleanup, no explicit usage of std in code
...
Code is supposed to be pure-C-ish with some C++-ism. All specifics are to be
handled in header files.
2017-11-09 11:24:51 +01:00
Sergey Sharybin
d325e6f0e8
Depsgraph: Make dependency graph to be built from scene layer
...
This is a final step of having proper ownership. Now selecting different
layers in the "top bar" will actually do what this is expected to do.
Surely, there are still things to be done under the hood, that will happen
in a less intrusive way.
2017-11-09 11:20:17 +01:00
Dalai Felinto
92b342d30d
Fix logic for pinning textures users from context
...
This was wrong since it's concenption in 28ee0f9218 .
The if statement was returning true when pinid was NULL, and false otherwise.
However when scene is pinned we also want to run this code.
Code snippet by Brecht Van Lommel.
2017-11-09 08:19:52 -02:00
Sergey Sharybin
c99481b632
Merge branch 'master' into blender2.8
2017-11-09 10:59:15 +01:00
Sergey Sharybin
8d7ec519df
Depsgraph: Add missing handlers of node IDs
...
Worst thing was that point density did not pull object into dependency graph,
which could lead to wrong render results.
2017-11-09 10:33:44 +01:00
Sergey Sharybin
5e38ee996c
Depsgraph: Remove chains of scene being passed all over in relations builder
2017-11-09 10:33:44 +01:00
Sergey Sharybin
f424d5b5c9
Depsgraph: Cleanup, remove scene being passed all over
...
Use the state one instead.
2017-11-09 10:33:44 +01:00
Sergey Sharybin
ad986ae29e
Depsgraph: Remove bmain from internal builder API
...
Use the one from state.
2017-11-09 10:33:44 +01:00
Sergey Sharybin
887c2e5c0d
Depsgraph: Make bmain part of builder state and remove bmain from public API
2017-11-09 10:33:44 +01:00
Sergey Sharybin
70e34ac186
Depsgraph: Cleanup, use google style for private members
2017-11-09 10:33:44 +01:00
Sergey Sharybin
9f0842bbe8
Depsgraph: Synchronize nodes and relations builders
2017-11-09 10:33:44 +01:00
Sergey Sharybin
1018683def
Depsgraph: Fix wrong ID type being compared
2017-11-09 10:33:44 +01:00
Sergey Sharybin
98425563ed
Depsgraph: Cleanup, reduce indentation level
2017-11-09 10:33:43 +01:00
Sergey Sharybin
449687d50a
Depsgraph: Assert when node uses unhandled ID type
2017-11-09 10:33:43 +01:00
Julian Eisel
ffe76ae9f4
Fix crash when loading pre 2.5 files.
...
Versioning code involving WM wouldn't run then (WM was just introduced
in 2.5).
2017-11-08 23:54:36 +01:00
Dalai Felinto
206c94fea9
Farewell Scene->base
...
While getting rid of Scene->base we got the following fixes:
* Fix "Convert To" operator
* Fix "NLA allowing to selected objects that are not selectable
* Fix scene.objects (readonly, no option to link/unlink)
Note: Collada needs to use the context SceneLayer for adding objects
however I added a placeholder, so Collada maintainers can fix this
properly.
2017-11-08 18:39:01 -02:00
Dalai Felinto
670e6cab43
Revert "Depsgraph: Fix crash with copy on write when scene has legacy bases"
...
This reverts commit 00ddbd5848 .
2017-11-08 18:36:01 -02:00
Dalai Felinto
3ceb3512f8
Merge remote-tracking branch 'origin/master' into blender2.8
2017-11-08 18:35:31 -02:00