griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
69,892 Commits 1 Branch 0 Tags
c59abb4c9a371e709c4904ce87d74c5c6c8a0792
Commit Graph

69892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luca Rood
c59abb4c9a Implement hair in eevee 
New implementation of hair for Eevee.

Note: A hard coded "transmission" property is being used. This should
eventually be exposed to the UI, possibly in the form of SSS
properties.
 2017-06-14 14:04:36 +02:00
Luca Rood
0d9611718d Temporarily disable material preview (T51796 workaround) 
This stops the memory breakage caused by the material preview jobs,
to enable the new hair drawing implementation.

(This should be reverted once T51796 is actually fixed!)
 2017-06-14 14:03:58 +02:00
Sergey Sharybin
28af03c1c2 Merge branch 'master' into blender2.8 2017-06-14 12:02:58 +02:00
Sergey Sharybin
481cf2982b Depsgraph: Cleanup, indentation 2017-06-14 12:01:52 +02:00
Sergey Sharybin
6656af2d11 Merge branch 'master' into blender2.8 2017-06-14 11:17:13 +02:00
Sergey Sharybin
20e5052a72 Remove unused bmain argument from BKE_libblock_free_data 2017-06-14 11:16:34 +02:00
Sergey Sharybin
48cd25a11a Merge branch 'master' into blender2.8 2017-06-14 10:54:58 +02:00
Sergey Sharybin
97f9f90986 Cleanup: Indentation got broken in previous commit 2017-06-14 10:54:30 +02:00
Sergey Sharybin
edad3076a9 Merge branch 'master' into blender2.8 2017-06-14 10:48:20 +02:00
Sergey Sharybin
1e6ad49dca Add utility function to free memory used by a datablock 
This function is similar to BKE_libblock_free but does no DEG
tagging or any extra things, just operates on memory.
 2017-06-14 10:45:20 +02:00
Sergey Sharybin
07c7bbef0d Merge branch 'master' into blender2.8 2017-06-14 10:11:18 +02:00
Sergey Sharybin
bbd0d43417 Depsgraph: Remove unused ID node removal 2017-06-14 10:10:52 +02:00
Sergey Sharybin
64aa0cff89 Cycles: Fix typo in comment 2017-06-14 09:54:07 +02:00
Campbell Barton
26efc7bbd1 Merge branch 'master' into blender2.8 2017-06-14 17:17:00 +10:00
Campbell Barton
2462320210 Fix buffer read error w/ 2 pass select queries 
Also don't do second pass when the first has no hits.
 2017-06-14 17:10:24 +10:00
Julian Eisel
a394d68177 Fix possible heap use-after-free in workspace lib-linking 
Caused by one of the recent commits during workspace review.
 2017-06-14 00:09:37 +02:00
Julian Eisel
c9de10a632 Fix compiling blenderplayer (tm) 2017-06-13 23:40:31 +02:00
Julian Eisel
0095f4f834 Fix T51794: Crash on hair file when opening with no UI 
Just a workaround for now.
 2017-06-13 23:37:37 +02:00
Sergey Sharybin
be4cf933ab Merge branch 'master' into blender2.8 2017-06-13 17:45:36 +02:00
Sergey Sharybin
f02e04f133 Add utility function to get size of given ID type 
Optionally it'll also give name used for memory allocation.
 2017-06-13 17:42:31 +02:00
Dalai Felinto
6ea6c51670 Better Fix for T51777: Separating objects by selected vertices 
This reverts commit 47b9d0d040. And
implement a fix that doesn't require Depsgraph refresh.
 2017-06-13 16:31:42 +02:00
Sergey Sharybin
7cfa6094ab Merge branch 'master' into blender2.8 2017-06-13 15:11:58 +02:00
Sergey Sharybin
6becdf5d00 Depsgraph: Pass function bindings by const reference 
Avoids using copy-constructor invoked every time we pass function
to the builder functions.

Should lower number of CPU ticks spent during DEG construction.
 2017-06-13 15:10:29 +02:00
Sergey Sharybin
4577bda634 Merge branch 'master' into blender2.8 2017-06-13 14:16:43 +02:00
Sergey Sharybin
90bc882068 Depsgraph: Remove root node concept 
Was rather weird and only used for time source. It is simpler to make depsgraph
to keep track of time source directly.

No need to introduce extra entitites without actual need.
 2017-06-13 14:13:55 +02:00
Hristo Gueorguiev
6cfa3ecd4d Fix T51791: Point Density doesn't work on GPU 2017-06-13 13:50:27 +02:00
Sergey Sharybin
b0b83c0db4 Draw manager: Fix initialization of static struct 
It's first member is a multi-dimensional array, so proper way to initialize that
is to use multiple levels of braces.
 2017-06-13 12:20:20 +02:00
Sergey Sharybin
4c6cb33764 Draw manager: Don't check matrix to be non-NULL 
It isn't a pointer, so the check was confusing and totally redundant.
 2017-06-13 12:17:55 +02:00
Sergey Sharybin
56ad2f0f1a Woarkspace: Remove residue of hidden type 
There is no reason to be special for workspace and go against other design
decision in Blender. If something like this is going to become a common
practice in Blender it should be well thought and well tested, including
tests of all supported compilers and configurations.

This feature was relying on type re-definition, which is not only confusing
but also available in C11 only.
 2017-06-13 12:02:08 +02:00
Sergey Sharybin
40c04dd649 Cycles: Cleanup, indentation 2017-06-13 10:28:38 +02:00
Sergey Sharybin
0aa5431998 Cycles: Fix compilation error of OpenCL mega kernel 
Was some mismatch in address space. Seems to be caused by recent additions.

Additionally, moved decoupled ray marching functions under ifdef, so they
don't try to use malloc() functions.

Thanks Mai for testing the patch!
 2017-06-13 10:26:45 +02:00
Campbell Barton
eaadfdbdc0 CMake: add missing includes 2017-06-13 14:51:15 +10:00
Dalai Felinto
47b9d0d040 Fix T51777: Separating objects by selected vertices in Eevee causes crash 
I considered just copying the evaluated data from the LayerCollection.
However we need to run the evaluation so Depsgraph can handle overrides.

I will double-check with Sergey Sharybin.
 2017-06-12 18:35:39 +02:00
Dalai Felinto
193a1df8fa Renaming: *_Iterator_begin/next > *_iterator_begin/next 2017-06-12 18:19:54 +02:00
Sergey Sharybin
2270ca9023 Merge branch 'master' into blender2.8 2017-06-12 16:55:57 +02:00
Sergey Sharybin
85fafccb4c Depsgraph: Remove residue from partial updates support 2017-06-12 16:55:04 +02:00
Dalai Felinto
109447d008 Draw Manager: Fix memory issues when copying scene 2017-06-12 16:12:33 +02:00
Dalai Felinto
8ca497b911 Depsgraph: Traversing should be consistent for nodes and relationship 
We need to traverse the same exact objects for both nodes and relationship
builder. We were using FOREACH_SCENE_OBJECT for relationships, which
would lead to plenty of warnings in multiple situations.

In the future we will need to change this to build the depsgraph
relations and nodes to one single render_layer.

Fix T51780: If an object is in two collections and I do a full copy of
scene things go bad
 2017-06-12 16:08:57 +02:00
Sergey Sharybin
0f4f4d8754 Merge branch 'master' into blender2.8 2017-06-12 15:12:36 +02:00
Sergey Sharybin
d8957e4cce Depsgraph: Use depsgraph from handle rather than from scene 
This way the code is more decoupled from the way where depsgraph is stored.
 2017-06-12 14:45:43 +02:00
Sergey Sharybin
1ba6ef25b6 Depsgraph: Add utility function to get depsgraph from node handle 
The idea is to use this function for modifiers' updateDepsgraph functions
instead of doing direct scene->depsgraph access.
 2017-06-12 14:41:46 +02:00
Sergey Sharybin
987ec1d030 Depsgraph: Remove outdated comment 2017-06-12 14:25:05 +02:00
Campbell Barton
f52dc2f371 Rename probe to light-probe 
Probe is a real general term, the new name is used often in docs online.
 2017-06-12 21:34:55 +10:00
Campbell Barton
12bd960df9 Fix crash drawing non-mesh geometry 2017-06-12 14:43:19 +10:00
Campbell Barton
00c4f49a6d Cleanup: indentation, long lines 2017-06-12 13:38:21 +10:00
Campbell Barton
5ccaef6d67 Fix T51737: Material properties error 
D2706 by @knox
 2017-06-12 12:55:47 +10:00
Campbell Barton
1bd6ed7128 Correct gtest EXPECT use 2017-06-12 10:25:18 +10:00
Hristo Gueorguiev
04530c9383 Cycles: adjust supported driver version for AMD GPUs 
On Windows 17.Q1 and 17.Q2 return driver version 2236.10.
 2017-06-11 23:17:46 +02:00
Julian Eisel
09eb11363e Use two decimal places for UI scale User Preference option 2017-06-11 22:59:54 +02:00
Campbell Barton
eb1cde5a81 GTest: initial kdopbvh test 
Currently only find-nearest, ray-casting needs to be added.
 2017-06-11 19:10:33 +10:00