griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
71,223 Commits 1 Branch 0 Tags
ca9801bd427ce2e76a992b62d476859efcc14547
Commit Graph

57032 Commits

Author SHA1 Message Date
Campbell Barton
ca9801bd42 Merge branch 'master' into blender2.8 2017-08-27 16:35:51 +10:00
Campbell Barton
c90452e111 BLI_rect: Function to calculate a matrix from 2 rctf's 2017-08-27 16:19:34 +10:00
Campbell Barton
2ff7ba2c6c Correct matrix stack assert 2017-08-27 11:22:31 +10:00
Campbell Barton
b07dcb8fb0 Missed last commit 2017-08-27 03:51:25 +10:00
Campbell Barton
b6b27b0671 Fix T52515: Crash on BMesh.to_mesh() 2017-08-27 02:44:15 +10:00
Campbell Barton
79111f9246 Merge branch 'master' into blender2.8 2017-08-27 00:51:54 +10:00
Campbell Barton
7e43210edb WM: move theme check out of ED_view3d_draw_select_loop 
In 2.8x this needs to be in view3d_opengl_select,
so simplest to make in master too.
 2017-08-27 00:48:52 +10:00
Campbell Barton
fa365d5f2f Fix minor Mesh -> BMesh conversion issues 
- Vertex only meshes never restored their selection history.
- Select history was cleared on the source instead of the target.

Simple Optimizations:
- Avoid O(n^2) linked list looping that checked the entire list before
  adding elements (NULL values in the source array to prevent dupes).
- Re-use vert & edge lookup tables instead of allocating new ones.
 2017-08-26 23:14:18 +10:00
Bastien Montagne
fe71c86888 Fix T52478: Error report "Shrinkwrap: out of memory" on invisible target. 
Shrinkwrap must check it does have valid target data.

Safe for 2.79 release.
 2017-08-26 14:48:00 +02:00
Bastien Montagne
5c4fc93f67 Fix T52538: Outliner crash when displaying groups and using Show Active on editmode bone not in any groups 
There's no guaranty that given ID is found in current outliner tree...

Safe for 2.79, though not a regression.
 2017-08-26 12:28:21 +02:00
Bastien Montagne
e2ffad7823 Fix T52481: After making all local, local proxies of linked data get broken after file save and reload. 
Issue was nasty hidden one, the dual status (mix of local and linked)
of proxies striking again.

Here, remapping process was considering obdata pointer of proxies as
indirect usage, hence clearing the 'LIB_TAG_EXTERN' of obdata pointer.
That would make savetoblend code not store any 'lib placeholder' for
obdata data-block, which was hence lost on next file read.

Another (probably better) solution here would be to actually consider
obdata of proxies are fully indirect usage, and simply reassign proxies
from their linked object's obdata on file read...

However, that change shall be safer for now, probably good for 2.79 too.
 2017-08-25 16:16:32 +02:00
Dalai Felinto
ae04e27bfa Revert "material Glsl: Fix tangent with new orco." 
This reverts commit 3888227a7b.

This "Fix" was made while ORCO was broken. Now that orco itself is fixed
this is no longer required, otherwise Tangent node produces different
results in Cycles and Eevee.
 2017-08-25 15:40:40 +02:00
Campbell Barton
52778ce625 Cleanup: missing break (harmless for now) 2017-08-25 22:53:37 +10:00
Dalai Felinto
0feeef89f0 Fix T52528: generated texture mismatch between Cycles and Eevee 
Finally orco should be working 100% on Eevee now. Thanks for Sergey
Sharybin for reporting this.
 2017-08-25 14:22:21 +02:00
Dalai Felinto
99b1f9f4f4 Revert "Eevee: Fix generated coordinates when no texture coordinates connected" 
This reverts commit 0e29a97813.
 2017-08-25 14:22:21 +02:00
Dalai Felinto
4e975b6b44 Fix ORCO never used for draw manager (Eevee) 
Related to T52528.
 2017-08-25 14:22:21 +02:00
Campbell Barton
8e6c18a98f Merge branch 'master' into blender2.8 2017-08-25 22:22:58 +10:00
Campbell Barton
de669c3b60 WM: ensure 3D view theme is used in select-loop 
Yet another case where theme could be used uninitialized.
 2017-08-25 22:10:27 +10:00
Campbell Barton
f8f6f8f26e Merge branch 'master' into blender2.8 2017-08-25 20:45:16 +10:00
Campbell Barton
16377abda8 WM: initialize WM and deps before handling events 
This avoids obscure bugs where operators could run from
events that happen before the UI and depsgraph have been initialized.

See: D2809 for details.
 2017-08-25 20:26:52 +10:00
Dalai Felinto
0e29a97813 Eevee: Fix generated coordinates when no texture coordinates connected 
Orco should behave the same if it comes from unconnected vec inputs, or
from the Texture Coordinate -> Generated node output.

Fixup for 11e7e0769a.

This is related to T52528. The coordinates are still different between
Eevee and Cycles, but at least it behaves consistent within itself.

In fact the shader should now be correct, but the orco attributes we are
passing the shader seems to be where the problem is. But it's to be
tackled separately.
 2017-08-25 11:47:38 +02:00
Campbell Barton
9e762693db Fix manipulator remove tag, it cleared all groups 2017-08-25 15:19:30 +10:00
Campbell Barton
3f4b3fdfba Manipulator: zero grab offset w/o target property 
Some manipulators are used like on-screen buttons,
in this case it doesn't make sense to keep track of their state,
so zero the offset when its unused.

Needed for lamp-target manipulator.
 2017-08-25 15:13:11 +10:00
Campbell Barton
738d942d29 Correct error in recent use of PyC_Long_* 
Regression in 46cf33bf0
 2017-08-25 02:09:23 +10:00
Campbell Barton
1b5a690c72 Fix crash handling manipulator events before drawing 2017-08-25 00:20:14 +10:00
Sergey Sharybin
33f9b6d016 Depsgraph: Fix crash editing mesh in edit mode 2017-08-24 16:01:08 +02:00
Sergey Sharybin
97fadb7b59 Depsgraph: Cleanup typo 2017-08-24 15:52:52 +02:00
Campbell Barton
9662803833 Fix error using wrong theme settings w/ depth draw 
Clicks events before first draw would assert,
unlikely to cause user visible errors but
would assert in UI_ThemeGetColorPtr.
 2017-08-24 23:22:55 +10:00
Sergey Sharybin
a679457263 Fix T51907: New Depsgraph - Camera constraint is not evaluated properly 
This is more a workaround for until we've got proper visibility flush, which
will likely happen in blender2.8 branch.
 2017-08-24 14:35:48 +02:00
Dalai Felinto
552656611b Merge remote-tracking branch 'origin/master' into blender2.8 2017-08-24 10:41:59 +02:00
Dalai Felinto
1fb2637006 Cycles Bake: Fix overflow when using hundreds of images 
We have a hardcored limit of 1000 images to be baked.
However anything anove 100 would be leading to overflow in the code.

Caught by warning from builder bot (my compiler doesn't even complain
about this, but it should).
 2017-08-24 10:34:56 +02:00
Campbell Barton
e20c825b05 Manipulator: modal callback can now cancel & pass events 
Re-use operator return flags for manipulator modal & invoke,
this means manipulators can allow navigation or other events to be
handled as they run - see T52499
 2017-08-24 17:04:28 +10:00
Campbell Barton
134e927965 Manipulator: remove unused event hack 2017-08-24 12:02:08 +10:00
Campbell Barton
e476298084 Docs: rename var and comment how it's used 
switch_from_camera wasn't right since it was used for auto-perspective.
 2017-08-24 02:11:31 +10:00
Dalai Felinto
efd07aaada Fix blenderplayer (tm) 2017-08-23 17:55:50 +02:00
Campbell Barton
0671814e3b Merge branch 'master' into blender2.8 2017-08-24 01:07:09 +10:00
Campbell Barton
0b5b464e82 Correction to last fix 2017-08-24 01:05:20 +10:00
Campbell Barton
76d695f761 Fix T52490: NDOF orbit doesn't lock in ortho view 
Regression in af3f7db caused by own fix for T51324
 2017-08-24 00:51:25 +10:00
Bastien Montagne
520ea73ad0 Fix bplayer (c) 2017-08-23 16:43:10 +02:00
Campbell Barton
3277bd4031 Fix T52396: Crash loading template w/o config dir 2017-08-23 22:06:42 +10:00
Campbell Barton
cb4884f50b Merge branch 'master' into blender2.8 2017-08-23 20:16:47 +10:00
Campbell Barton
b9513706cb Cleanup: mark VA_NARGS_COUNT as public 
Was already used in two other headers, remove underscore prefix.
 2017-08-23 20:16:17 +10:00
Campbell Barton
37cfa44222 Cleanup: move variadic defines to their own header 
So we can use in headers without pulling in many other defines.
 2017-08-23 20:16:17 +10:00
Sergey Sharybin
1a76bc7aeb Fix T52218: Missing update when reconnecting node 
If node was connected to output, we tag tree for update no matter where
the node was re-plugged to.

Should be safe for 2.79.
 2017-08-23 11:49:20 +02:00
Campbell Barton
54507234b7 RNA: use string join functions as with operators 2017-08-23 19:40:48 +10:00
Campbell Barton
917d069cdb Merge branch 'master' into blender2.8 2017-08-23 19:21:52 +10:00
Campbell Barton
cf8d35edc8 RNA: use string-join to simplify operator register 
Also sanity check macro-operator ID's.
 2017-08-23 19:18:22 +10:00
Campbell Barton
81c0e643a0 BLI_string_utils: string joining utility functions 
Includes a version that takes a separator and macros for convenience.
 2017-08-23 19:17:27 +10:00
Campbell Barton
55861cb234 PyAPI: avoid instantiating args twice in macro 
Would cause problems if args included function calls.
 2017-08-23 18:48:32 +10:00
Campbell Barton
9d6d413c7c RNA: check for duplicate manipulator names 2017-08-23 16:22:48 +10:00