griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
73,538 Commits 1 Branch 0 Tags
4ebcdff873cb71bb031155a9bddcc92dde8e6370
Commit Graph

58936 Commits

Author SHA1 Message Date
Campbell Barton
4ebcdff873 Merge branch 'master' into blender2.8 2018-01-23 20:04:54 +11:00
Campbell Barton
9466f8f531 Cleanup: use doxygen groups for view3d_edit.c 2018-01-23 19:48:49 +11:00
Campbell Barton
f6dc7a7cf3 Cleanup: code comment for view3d_viewmatrix_set 2018-01-23 17:36:51 +11:00
Campbell Barton
8181e4c812 Manipulator: limit UI for locked views 2018-01-23 17:11:13 +11:00
Campbell Barton
e679f472ed Cleanup: avoid passing bContext to cameracontrol 2018-01-23 15:19:53 +11:00
Germano
3a712632f5 Merge branch 'master' into blender2.8 
# Conflicts:
#	source/blender/editors/screen/screen_ops.c
 2018-01-23 01:00:16 -02:00
Germano
85ca39ec4b Fix screen split refresh issues 
`Ctrl` (enable snapping) ans `TAB` (Switching direction) didn't refresh.
 2018-01-22 23:07:36 -02:00
Campbell Barton
1443235aa4 Cleanup: sync w/ blender2.8 branch 
Also make some args const
 2018-01-23 12:14:26 +11:00
Campbell Barton
fc1fd2704a Merge branch 'master' into blender2.8 2018-01-23 11:45:39 +11:00
Campbell Barton
367e611179 Merge branch 'master' into blender2.8 2018-01-23 11:24:44 +11:00
Dalai Felinto
f0ef360386 Grease-Pencil: Icons from the grease pencil branch 2018-01-22 14:37:50 -02:00
Dalai Felinto
0a622c6dd6 Collections/Layer cleanup: Remove placeholder for de/select objects 
No need for placeholders bloating the source code. They can come back once
we decide to implement them.
 2018-01-22 12:43:24 -02:00
Dalai Felinto
7628961391 Collections/Layer cleanup: Remove all reference to filter objects 
This was not implemented yet. So it's a bit pointless to have all this
placeholder code around without any functionality coming out of it.
 2018-01-22 12:43:19 -02:00
Dalai Felinto
8e5f433554 Collections/Layer cleanup: Remove TODO_LAYER_OVERRIDE from most places 
This was originally a good idea. However we will need to pay special attention
to this when doing the dynamic overrides anyways. The placeholders won't be
enough to spare us that job.

That said I left the ones on layer.c because we are actually calling these
BKE_override_*_add() functions from doversion, yet they don't do anything.
 2018-01-22 12:43:09 -02:00
Philippe Schmid
48fb7e9635 T53831: Fixed vertical line alignment & expand Collection and Scene buttons position. 
This was fixed in master with commit 9d873fc3de. However, this fix never made it to 2.8.
(The following merge (a96008f3aa) did not import the fixes.)

Note: This fix is ment to fix the alignment problem.
I don't know if other parts of the code not merged are interesting or not.

But if they are, they should be tackled separately.

Reviewers: dfelinto

Subscribers: venomgfx, dfelinto, raa, Severin

Differential Revision: https://developer.blender.org/D3014
 2018-01-22 12:08:30 -02:00
Dalai Felinto
0f69026b1c Fix windows building (log10) 
Error: math_base_inline.c(402): error C2668: 'log10' : ambiguous call to
overloaded function
 2018-01-22 11:37:19 -02:00
Campbell Barton
fb4582134a Fix T53850: Lock to Cursor breaks 3D manipulators 2018-01-22 20:14:12 +11:00
Campbell Barton
f7c812e199 Merge branch 'master' into blender2.8 2018-01-22 14:14:33 +11:00
Campbell Barton
c723e91ee1 WM: add mouse-move after smooth-view 
When hot-spots moved under the pointer,
clicking wouldn't activate the correct item.
 2018-01-22 14:09:17 +11:00
Campbell Barton
ebbed57bef Manipulator: draw all rules while dragging 2018-01-22 13:52:45 +11:00
Campbell Barton
759aaad0f3 Cleanup: commends 
Avoid copy-pasting same comments.
 2018-01-22 11:32:03 +11:00
Campbell Barton
d629f2a8a3 Cleanup: reuse camera frame arrays 
Use GWN_vertbuf_raw_step in a loop for less verbose vbo creation.
 2018-01-22 11:28:34 +11:00
Campbell Barton
809dc17254 Merge branch 'master' into blender2.8 2018-01-22 10:42:42 +11:00
Ines Almeida
9211a4acf8 Fix linking error when compiling without clay engine 2018-01-22 00:19:38 +01:00
Clément Foucault
13715adc09 DRW: Object Mode: Fix bad camera display in camera view 
This fix T53485 : Ortho cameras display frame when in camera view
 2018-01-22 00:14:28 +01:00
Campbell Barton
a841e65b85 Cleanup: unused var 2018-01-22 10:00:40 +11:00
Clément Foucault
777e1d358a Eevee: Probes: Add support for intensity tweak. 
This works for grid and cubemaps.

The intensity is baked into the map itself. Thus you need to refresh/rebake the probe to see the changes.
 2018-01-21 23:16:59 +01:00
Clément Foucault
73a1bf1a80 Eevee: Fix grid lighting disappearing when adding a new cubemap probe. 2018-01-21 23:16:59 +01:00
Clément Foucault
bdfd9a11e8 Clay: Performance: Disable AO codepath if not necessary. 
This optimisation only works if no material in the scene require the AO pass.
For this either set the AO distance to 0 or both Cavity and Edges factors to 0.

This double the performance of scenes with very high triangle count.
 2018-01-21 23:16:59 +01:00
Clément Foucault
6700ee9855 DRW: Make the lamp widgets lines stippled. 2018-01-21 23:16:59 +01:00
Clément Foucault
b2c81c5d43 DRW: Remove unused material uniforms. 
This might have some consequences but in my testing I did not found any.
 2018-01-21 23:16:59 +01:00
Clément Foucault
e82616aea6 Eevee: SSR: Optimize the AO out when not enabled. 2018-01-21 23:16:59 +01:00
Clément Foucault
a507c251b2 Eevee: Put all constant uniforms in a global UBO. 
This is an optimization / cleanup commit.

The use of a global ubo remove lots of uniform lookups and only transfert data when needed.

Lots of renaming for more consistent codestyle.
 2018-01-21 23:16:59 +01:00
Germano
790025c01e Merge branch 'master' into blender2.8 
# Conflicts:
#	intern/cycles/blender/blender_mesh.cpp
#	source/blender/editors/screen/screen_ops.c
#	source/blender/editors/space_view3d/drawobject.c
 2018-01-21 18:45:47 -02:00
Germano
8d671f6f65 Update description of the screen_draw functions 2018-01-21 18:22:39 -02:00
Germano
46267fe7bf WM: Fix snapping on split area without preview 
In addition to removing unnecessary variables and `tag_redraw` whenever the factor changes;
 2018-01-21 18:18:38 -02:00
Campbell Barton
e767d21b74 Cleanup: BLI_kdopbvh avoid negative array access 
It's harder to reason about array access with negative indices.
 2018-01-21 20:17:29 +11:00
Campbell Barton
a7dc5e12ac Cleanup: style 2018-01-21 11:41:52 +11:00
Brecht Van Lommel
e53447c137 Fix old files with changed node socket type not loading correctly. 
This would lead to sock.default_value pointing to the wrong data type,
possibly causing crashes. Unfortunately, this bug will still exist for
older Blender versions that try to load newer files, which makes
changing the type of a node socket problematic.
 2018-01-20 22:42:59 +01:00
Campbell Barton
99efebd2dd Merge branch 'master' into blender2.8 2018-01-21 01:47:49 +11:00
Campbell Barton
dd35048602 Cleanup: doxy groups for screen_ops.c 2018-01-21 01:41:58 +11:00
Campbell Barton
a177d64213 Merge branch 'master' into blender2.8 2018-01-21 00:55:08 +11:00
Campbell Barton
949e56dff1 Fix screen split preview refresh issues 
Switching direction didn't refresh, also cursors were flipped.
 2018-01-21 00:41:48 +11:00
Campbell Barton
da53eb3748 Manipulator: tweak shape drawing 
Draw triangles over wire for a more subtle outline.
 2018-01-20 19:41:41 +11:00
Campbell Barton
a3716f5945 GPU_batch: Add GPU_batch_wire_from_poly_2d_encoded 
Draws wire around polygon shapes:
better visibility w/ any background color.
 2018-01-20 18:45:27 +11:00
Dalai Felinto
e969ac6413 Fix collections names no longer unique when moved around 
We were not checking for uniqueness after moving. And in some cases the new
siblings of our collection may have conflicting names.
 2018-01-19 18:44:11 -02:00
Dalai Felinto
4dfccf8b7f Collections: Fix for auto-named children when parent name is MAX_NAME 
Reported via IRC by Vuk Gardašević (lijenstina).
 2018-01-19 17:24:35 -02:00
Dalai Felinto
244fb3ebe0 Merge remote-tracking branch 'origin/master' into blender2.8 2018-01-19 17:06:32 -02:00
Dalai Felinto
431d5772bb Fixup for integer digits commit 2018-01-19 17:04:19 -02:00
Dalai Felinto
4d0bb7de64 Merge remote-tracking branch 'origin/master' into blender2.8 2018-01-19 17:01:48 -02:00