griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
72,929 Commits 1 Branch 0 Tags
52d33d6ab91082a8a09d0e814a483bc23a759f79
Commit Graph

58397 Commits

Author SHA1 Message Date
Bastien Montagne
52d33d6ab9 Merge branch 'master' into blender2.8 2017-12-12 18:00:36 +01:00
Bastien Montagne
ef8bbc8cba Fix bplayer (c). 2017-12-12 14:23:19 +01:00
Campbell Barton
56f00db6c9 Correct error in recent merge 2017-12-12 23:19:41 +11:00
Sergey Sharybin
99069c8ae2 Revert "Node selection: Stop operator when mouse selection selected a node" 
While re-route operator got fixed, node resize became broken.

This reverts commit 43f33ea300.
 2017-12-12 10:34:38 +01:00
Campbell Barton
edd39f6da7 Merge branch 'master' into blender2.8 2017-12-12 16:13:06 +11:00
Campbell Barton
b3c147a04f Cleanup: split eyedropper into separate files 
Each handles separate data-types and didn't share much logic,
better put each in it's own file.
 2017-12-12 15:44:59 +11:00
Campbell Barton
41fc0a0624 Merge branch 'master' into blender2.8 2017-12-12 13:55:09 +11:00
Campbell Barton
58aa31a9ec Cleanup: minor edits to last commit 2017-12-12 13:37:21 +11:00
Campbell Barton
f7a1a1a700 UI: rewrite color-ramp re-sampling 
Instead of picking evenly spaced pixels color-ramp simplification
now works by removing elements with the lowest cost.
 2017-12-12 13:20:56 +11:00
Ray Molenkamp
7ae4c3a019 Add eyedropper to color-ramp widget 
D2886 by @LazyDodo with edit's by @campbellbarton

The line drawn with the eyedropper is used to fill the color-ramp.
 2017-12-12 13:11:38 +11:00
Sergey Sharybin
43f33ea300 Node selection: Stop operator when mouse selection selected a node 
Previously, hitting Shift-LMB will first invoke selection operator, which
then later on is transformed to mouse tweak used for reroute operator.

This was causing problems extending selection with Shift-LMB when clicking
fast or from a tablet.
 2017-12-11 17:38:47 +01:00
Sergey Sharybin
7719f7d27a Fix T53528: Empty thumbnails in filebrowser 
Bug in recent refactor.
 2017-12-11 15:47:52 +01:00
Campbell Barton
54f7bb4582 Fix for inset when accessed from spacebar search 2017-12-12 01:38:33 +11:00
Bastien Montagne
14655418d1 Add 'Add static override' to outliner's menus. 2017-12-11 12:07:13 +01:00
Bastien Montagne
75fbd60b06 Walk all the overriding chain to try to find a template. 
When one creates a new local static override from another linked
data-block already overriding a third one etc., walk the whole
inheritance chain up to the original ancestor to try to find an
overriding template, instead of only checking the immediate reference...
 2017-12-11 12:07:13 +01:00
Bastien Montagne
48fe46943e Add a new button in ID template to generate an override, and new icon placeholder. 
Note that due to mess with inkscape (see T53516), I cannot generate a new icon
currently. :(

Commit related to T53501.
 2017-12-11 12:07:13 +01:00
Campbell Barton
6475f163ec Manipulator: make grab-cursor a manipulator flag 
As with operators, allow manipulators to grab the cursor.
Previously this was enabled for all 3D manipulators.
 2017-12-11 21:38:55 +11:00
Campbell Barton
dd4e0cd3e3 DNA/RNA: add 'py_instance' for ID types 
Avoid creating new Python instances
every time a scene, object, mesh .. etc are accessed.

Also resolves crashes T28724, T53530
although it's only valid for ID types, not modifiers vertices etc.

Back-ported from blender2.8 branch.
 2017-12-11 18:37:54 +11:00
Campbell Barton
a2f2231014 Fix grab3d manipulator in a 2D group 
Was taking scale into account twice.
 2017-12-11 17:07:40 +11:00
Campbell Barton
2e685136c4 WM: update splash size for templates 2017-12-11 12:53:28 +11:00
Dalai Felinto
9454359a16 Workspace: Clarifying library remap workaround 
WorkSpaceLayout->screen will be made public soon, but meanwhile this makes it
clear why we are not passing layout->screen to CALLBACK_INVOKE in this case.
 2017-12-08 13:35:31 -02:00
Sergey Sharybin
392c23bdb9 Library remap: Fix issue remapping pointer of object coming from group[s base 
We can not store pointer to an object ion temporary variable here, since then
pointer will not be updated in the base itself.

This fixes missing modifiers on objects coming from dupli-group.
 2017-12-08 16:07:25 +01:00
Sergey Sharybin
34522017de Cleanup, indentation 2017-12-08 16:07:20 +01:00
Sergey Sharybin
36e09b5ada Depsgraph: Groups are now covered by dependency graph 2017-12-08 16:07:20 +01:00
Sergey Sharybin
7aa022b7a8 Depsgraph: We need to add ID node before getting CoW pointer 
Need to split runtime get-cow-pointer with a builder one, and add some asserts
to catch mis-use.
 2017-12-08 16:07:20 +01:00
Germano
f57317c6e7 Merge branch 'master' into blender2.8 2017-12-08 12:43:52 -02:00
Germano
e6838ecc26 Fix T53512: Vertices with index 0 were not being selected 
Bug introduced on rB9f5bf197a0c3.
The offset for selection of vertices (`bm_vertoffs`) starts where the offset o edges ends (`bm_wireoffs`).
However, the `bm_wireoffs` depends on the offset of face selection (`bm_solidoffs`).

Before the commit that introduced the bug, the drawn of edges (in backbuff) was always computed along with the `bm_wireoffs`:
```
bm_wireoffs = bm_solidoffs + em->bm->totedge;
```

Now that the edges are not always drawn in backbuff, `bm_wireoffs` has to start from `bm_solidoffs`.
 2017-12-08 12:42:00 -02:00
Sergey Sharybin
8817faa02d Cleanup, indentation 2017-12-08 15:05:38 +01:00
Sergey Sharybin
82c0a54168 Depsgraph: Use dedicated function for group evaluation 
It is still based on generic collection evaluation, but the idea is to avoid
having view_layer pointer passed from group to it's evaluation function.

This is essential for copy-on-write, where we need to pass view_layer pointer
from a copied datablock, but that copy is not yet available at construction
time. Also, this is NOT the case where we want to expand datablock at a
construction time, just to keep our life easier.
 2017-12-08 15:05:38 +01:00
Dalai Felinto
af47ae0702 Fix group duplication bug 
View Layer was not duplicated between destination and source.

This would lead to a crash if you duplicated the group and assigned
the new group to any object.
 2017-12-08 12:04:05 -02:00
Dalai Felinto
0d4ab09da7 Code cleanup 
Thanks for Sergey Sharybin for spotting this.
 2017-12-08 12:04:05 -02:00
Bastien Montagne
6e85c59250 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/interface/interface_templates.c
 2017-12-08 14:54:59 +01:00
Bastien Montagne
f39a97fac5 Cleanup: moar busting of nasty C++ keywords-as-varnames. 2017-12-08 14:50:45 +01:00
Bastien Montagne
087997f9eb Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/interface/interface_templates.c
 2017-12-08 14:39:17 +01:00
Bastien Montagne
c7ee64b2d9 Cleanup: avoid using C++ keywords as variables, even in pure C code. 
This tends to make some IDE unhappy (like QTCreator)...
 2017-12-08 14:36:07 +01:00
Clément Foucault
0467ddc674 Eevee: Fix default shader SSR id. 2017-12-08 11:58:04 +01:00
Clément Foucault
9aaf75da3d Eevee: Fix SSR ans SSAO for intel GPU. 
On my intel GPU there is some issue when rendering to depth only format.
This workaround the issue.
 2017-12-08 11:58:04 +01:00
Clément Foucault
7f48923986 Eevee: Remove unecessary defines. 2017-12-08 11:58:04 +01:00
Dalai Felinto
dc848e9a8b Merge remote-tracking branch 'origin/master' into blender2.8 2017-12-07 15:00:03 -02:00
Dalai Felinto
237df2f860 Fix Collada building 
Bug introduced in cc811d1fd6.
 2017-12-07 11:51:46 -02:00
Sergey Sharybin
70957565dd DPX/Cineon: Report orientation when running with --debug 2017-12-07 14:38:20 +01:00
Campbell Barton
1c0905be0f Merge branch 'master' into blender2.8 2017-12-08 00:21:54 +11:00
Sergey Sharybin
bfbcc5e581 Fix T53499: Cannot load DPX files 
The issue was caused by unspecified color transfer. New behavior gives same
result as other viewers here, so likely is fine :)
 2017-12-07 14:07:57 +01:00
Sergey Sharybin
9ea7d0bf44 DPX: Fix wrong flag being checked for debug 2017-12-07 14:04:27 +01:00
Campbell Barton
1c7cfa025c Merge branch 'master' into blender2.8 2017-12-07 23:53:03 +11:00
Campbell Barton
2e2e6e3bdb Cleanup: Use BKE_colorband prefix 2017-12-07 15:52:59 +11:00
Campbell Barton
cc811d1fd6 Cleanup: extract BKE_colorband from BKE_texture 2017-12-07 15:40:11 +11:00
Campbell Barton
6d31eb015c Array Modifier: option to offset UV's 
D2912 by @Zuorion
 2017-12-07 04:33:52 +11:00
Daniel Silva
2dfd795bd2 Proposed fix for T53263 -- Blender crashes when rendering with Stabilizer 2D node without movie selected 
The program won't crash anymore, but a warning won't be displayed. Anyway, this gives the user the chance to save the project.

https://developer.blender.org/T53263

Reviewers: lukastoenne

Differential Revision: https://developer.blender.org/D2934
 2017-12-06 14:54:51 +01:00
Sergey Sharybin
46f518e927 Merge branch 'master' into blender2.8 2017-12-06 14:06:49 +01:00