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

3655 Commits

Author SHA1 Message Date
Campbell Barton
57660aac74 Merge branch 'master' into blender2.8 2017-05-16 13:01:26 +10:00
Campbell Barton
d508b69e44 Cleanup: gcc7.1 warnings 2017-05-16 12:46:52 +10:00
Clément Foucault
e053fade99 Mesh Batch Cache: get rid of the ORCO VBO data, and reconstruct it in shader. 
With only one MADD instruction we recover the orco data and reduce both the storage and the fetching cost of an attrib layer.
 2017-05-15 16:14:18 +02:00
Clément Foucault
38125d0499 Mesh Batch Cache: Define Compressed format for shading data. 
Deactivated by default.
All shading attribs can be packed to take less VRAM at the cost of precision (not noticable in this case).
UVs can be packed into I16 but that limits their positions into the [-1, +1] range.

This could be a setting option in the future.
 2017-05-15 16:14:17 +02:00
Sergey Sharybin
3a5501d168 Use static assert in Clay engine to ensure struct alignment 2017-05-12 12:02:45 +02:00
Julian Eisel
9181f13af7 Merge branch 'master' into blender2.8 2017-05-08 00:19:22 +02:00
Campbell Barton
bca6978347 Cleanup: use index syntax instead of addition 
Harmless but made accessing the first element read strangely.
 2017-05-07 03:21:27 +10:00
Campbell Barton
ce31a892db Cleanup: use uint/ushort for polyfill2d 2017-05-07 02:19:56 +10:00
Campbell Barton
bdb4ecfbdd Cleanup: use const pointers where possible 2017-05-07 02:12:35 +10:00
Campbell Barton
90ebf4832f Merge branch 'master' into blender2.8 2017-05-06 22:54:28 +10:00
Campbell Barton
0eef40ed51 Cleanup: unused return, redundant assignments 2017-05-06 22:43:32 +10:00
Campbell Barton
a9572c2820 PyAPI: Remove bpy.app.handlers.scene_update 
This is routinely mis-used to continuously run scripts,
causing performance problems.

This should be replaced with more specific handlers, or possibly timers.
See: T47811
 2017-05-06 22:24:12 +10:00
Campbell Barton
b85f7e288e Cleanup: line length, use const struct members 2017-05-06 11:13:14 +10:00
Campbell Barton
002b2066ac Remove cpack 
Places where it's removed are already replaced by newer logic.
 2017-05-04 20:50:03 +10:00
Campbell Barton
c9d4a0930b Merge branch 'master' into 28 2017-04-27 00:58:28 +10:00
Sergey Sharybin
e61ba39e7c Ensure task scheduler exists before any threading starts in Blender 2017-04-26 16:00:02 +02:00
Bastien Montagne
2387ba93d2 BLI_math: add helper function to extract XY 2D scale from a 4D matrix. 2017-04-26 12:00:15 +02:00
Campbell Barton
2010dbe8a5 Merge branch 'master' into blender2.8 2017-04-24 22:11:05 +10:00
Campbell Barton
aff30aaf2d Cleanup: style 2017-04-24 22:00:46 +10:00
Bastien Montagne
6d9a223c90 BLI_dynstr: add memarena-based version, and helper to clear without freeing. 2017-04-24 10:42:10 +02:00
Sybren A. Stüvel
81011679dd Merge branch 'master' into blender2.8 2017-04-21 14:19:05 +02:00
Campbell Barton
55a3d48046 Docs: diagram for reflect_v3_v3v3 2017-04-21 17:27:20 +10:00
Campbell Barton
d8bf090090 Merge branch 'master' into 28 2017-04-20 18:16:01 +10:00
Campbell Barton
9bb8e46460 Docs: move note (was mixed up) 2017-04-20 17:11:12 +10:00
Dalai Felinto
c9d78b6c43 Merge remote-tracking branch 'origin/master' into blender2.8 2017-04-18 16:30:13 +02:00
Dalai Felinto
bc6a75b405 Revert "Object Info node support for GLSL mode and the internal render" 
This reverts commit 76425feed8.

** Note **
This was supposed to be a merge, but it was rebased.
 2017-04-18 16:29:42 +02:00
Campbell Barton
70018eb16e Cleanup: missing headers 2017-04-19 00:25:31 +10:00
Alexander Romanov
76425feed8 Object Info node support for GLSL mode and the internal render 
Object Info node can be useful to give some variation to a single material assigned to multiple instances. This patch adds support for Viewport and BI.

{F499530}

Example: {F499528}

Reviewers: merwin, brecht, dfelinto

Reviewed By: brecht

Subscribers: duarteframos, fclem, homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov

Differential Revision: https://developer.blender.org/D2425
 2017-04-18 15:37:22 +02:00
Bastien Montagne
819064154c BLI: make BLI_make_existing_file() return true on success, and false on failure... 2017-04-17 17:35:53 +02:00
Alexander Romanov
11f4b407d4 Fix build error on Windows introduced in D2425 2017-04-17 13:41:05 +03:00
Alexander Romanov
78b5d66af8 Object Info node support for GLSL mode and the internal render 
Object Info node can be useful to give some variation to a single material assigned to multiple instances. This patch adds support for Viewport and BI.

{F499530}

Example: {F499528}

Reviewers: merwin, brecht, dfelinto

Reviewed By: brecht

Subscribers: duarteframos, fclem, homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov

Differential Revision: https://developer.blender.org/D2425
 2017-04-14 18:15:57 +03:00
Bastien Montagne
95b3632112 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/alembic/intern/abc_exporter.cc
 2017-04-14 12:39:54 +02:00
Sergey Sharybin
575d6415fb Task scheduler: Fix typo in TLS for pools created from non-main thread 
Did a mistake which started to use same TLS for all threads for such pools.

Also added some extra asserts to help catching the bugs.
 2017-04-13 13:34:07 +02:00
Alexander Romanov
6f268ac55d Merge branch 'master' into blender2.8 2017-04-13 13:02:39 +03:00
Sergey Sharybin
ed5c3121f5 Task scheduler: Prevent race condition for the pools created from non-main thread 
We can not re-use anything for such pools, because we will know nothing about whether
the main thread is sleeping or not. So we identify such threads as 0, but we don't
use main thread's TLS.

This fixes dead-locks and crashes reported by Luca when doing playblasts.
 2017-04-12 18:20:17 +02:00
Campbell Barton
c800ee6bfe Merge branch 'master' into blender2.8 2017-04-09 16:09:12 +10:00
Campbell Barton
162e184ffd ListBase: Add insert-replace function 
Handy to replace an existing link
(without having to store before/after links)

Use for id-props
 2017-04-09 16:07:09 +10:00
Sergey Sharybin
7fc84d4e32 Merge branch 'master' into blender2.8 2017-04-04 15:47:58 +02:00
Sergey Sharybin
ca5ccf5cd4 Task: Remove non-atomic pool suspended flag assignment 
This was done some lines above by atomic fetch and and.
 2017-04-04 12:32:15 +02:00
Campbell Barton
0c93bc2b63 Merge branch 'master' into blender2.8 2017-03-25 13:39:47 +11:00
Campbell Barton
50f9fc7a53 BLI_path_util: Add BLI_path_join 
There weren't any convenient ways to join multiple paths in C
that accounted for corner cases.
 2017-03-24 17:40:35 +11:00
Campbell Barton
05b7591c62 BLI_path_util: Add string versions of SEP, ALTSEP 
This allows for adding separators in string literals.
 2017-03-24 05:23:03 +11:00
Campbell Barton
d8b34a17ac Cleanup: remove BLI_getlastdir 
Replace with BLI_path_name_at_index
 2017-03-23 06:33:30 +11:00
Campbell Barton
d0253b2ea4 BLI_path_util: add BLI_path_name_at_index 
Utility to get a file/dir in the path by index,
supporting negative indices to start from the end of the path.

Without this it wasn't straightforward to get
the a files parent directory name from a filepath.
 2017-03-22 19:34:43 +11:00
Campbell Barton
4dacda58f9 Merge branch 'master' into blender2.8 2017-03-13 07:51:10 +11:00
Campbell Barton
10404e3e56 Comments: minor clarification 2017-03-13 07:18:28 +11:00
Campbell Barton
fbb1b311ea Merge branch 'master' into blender2.8 2017-03-12 03:00:06 +11:00
Campbell Barton
bcc8c04db4 Cleanup: code style & cmake 2017-03-12 02:47:53 +11:00
Campbell Barton
a68c631cf8 Merge branch 'master' into blender2.8 2017-03-09 16:41:33 +11:00
Dalai Felinto
9b2877ad88 New util function: BLI_listbases_swaplinks 2017-03-08 23:35:54 +01:00