Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
68,688 Commits 2 Branches 0 Tags
677aa36632c6ed61815e9cbe04e317b290620b59
Commit Graph

68688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Campbell Barton
677aa36632 Curve: draw curve/surface/text geometry 
Note that displists will be removed, but this wont be hard to replace.

Signed-off-by: Campbell Barton <ideasman42@gmail.com>
 2017-04-21 04:23:28 +10:00
Dalai Felinto
9d1421c069 RNA: depsgraph.objects 
Iterator to return the objects evaluated from depsgraph. The
iterator itself will change once CoW is implemented.

This reproduces the behaviour of DEG_OBJECT_ITER but for Python.
 2017-04-20 17:21:06 +02:00
Dalai Felinto
f2a2adc910 RNA: bpy.context.depsgraph 2017-04-20 17:20:56 +02:00
Sergey Sharybin
74023d46ce Implement DAG_get_scene_layer 
Even though this will have to change once we get workspaces, we will
still have a depsgraph for the Scene.

This is required for the upcoming depsgraph.objects RNA iterator.
 2017-04-20 17:18:31 +02:00
Campbell Barton
66377b89da Fix T51251: Armature/Normal-button scaled twice 2017-04-20 22:12:08 +10:00
Campbell Barton
afc885cd13 Draw Manager: round vertex size up 
Without this assigning `gl_PointSize = sizeVertex`
made vertices too small.
 2017-04-20 21:16:37 +10:00
Campbell Barton
84c464a4b8 Use theme vertex size for lattice & curve vertices 2017-04-20 21:16:37 +10:00
Clément Foucault
3d17ece539 Eevee: Start Implementation of Cascaded Shadow Maps 2017-04-20 13:07:51 +02:00
Clément Foucault
b386828671 Eevee: Do shadow cube render in one pass. 2017-04-20 13:07:51 +02:00
Clément Foucault
3fa665f56d Draw Manager: Fix Gradient Background 2017-04-20 13:07:51 +02:00
Campbell Barton
6028ff2736 Correct error drawing curve normals 2017-04-20 21:01:23 +10:00
Sybren A. Stüvel
aa4102a441 Merge branch 'master' into blender2.8 
Disabled a unittest, to be re-enabled when T51261 is fixed.

# Conflicts:
#	source/blender/alembic/intern/alembic_capi.cc
 2017-04-20 12:50:20 +02:00
Campbell Barton
8e0c57a812 Gawain: fix immediate mode drawing exceeding IMM_BUFFER_SIZE 
Would cause crazy colors in file selector.
 2017-04-20 20:43:56 +10:00
Sybren A. Stüvel
ae79eb2105 Alembic import: select imported objects 
When the Alembic import is finished, all imported objects are selected.
 2017-04-20 12:01:31 +02:00
Sergey Sharybin
28ed66552b Fix debug checks were enabled for release builds only 
NDEBUG meanse Not DEBUG.
 2017-04-20 11:03:55 +02:00
Dalai Felinto
913472165b Fix T51215: depsgraph evaluation of collection properties (overrides) 2017-04-20 11:00:32 +02:00
Dalai Felinto
3cb0e8e1af IDProperty: New util function to merge groups recursively 2017-04-20 11:00:32 +02:00
Dalai Felinto
53d59af364 Corrections for layers unittest based on design change 
Example, imagine an object Cube in collections 1 and 2 where both
collections are nested to A. Now we set a "color" property as follow:

```
Scene -> GREEN
--
A     -> RED
↳ 1   -> BLUE
↳ 2   -> -
```

In this case the object will be RED, because of A↳ 2.

Now if we have:

```
Scene -> GREEN
--
A     -> RED
↳ 1   -> -
↳ 2   -> PINK
1     -> -
--

The object will be PINK because of A↳ 2.

Note that the (top level) collection 1 doesn't influence the object color
because there are no overrides on it. The scene render settings (GREEN
in this case) are only used as fallback if an override is not set at
all.
 2017-04-20 11:00:32 +02:00
Sergey Sharybin
b5b0fc9c94 Cleanup: Use explicit unsigned int type 
This is as per our code style states ans as majority of the team
prefers types to be used.
 2017-04-20 10:56:08 +02:00
Campbell Barton
09bf8f4a69 Use reflect for calculating second normal 2017-04-20 18:56:53 +10:00
Alexander Romanov
31c644b657 Fix T51198: Crash with new Datablock ID Properties 2017-04-20 11:40:31 +03:00
Campbell Barton
d8bf090090 Merge branch 'master' into 28 2017-04-20 18:16:01 +10:00
Campbell Barton
6da53e46c9 Use reflect for calculating second normal 2017-04-20 18:08:05 +10:00
Campbell Barton
9bb8e46460 Docs: move note (was mixed up) 2017-04-20 17:11:12 +10:00
Campbell Barton
462d9e37ea Cleanup: remove type prefix from render-data vars 
Render data is never mixed with other object types,
no need to make a distinction.
 2017-04-20 16:25:20 +10:00
Brecht Van Lommel
6c26911c3d Fix T51248: user preferences window size not adapted to DPI. 2017-04-20 01:19:47 +02:00
Bastien Montagne
c7c162e2e0 Fix merge of master (no more base...). 2017-04-19 22:13:57 +02:00
Bastien Montagne
6a5b53fe6f Merge branch 'master' into blender2.8 2017-04-19 22:11:53 +02:00
Bastien Montagne
1873ea337c Fix T51243: Delete Globally won't work with Datablock ID Properties. 
That's a quick hack to address that specific case, new pointer IDProp
actually enlights a generic problem - datablocks using themselves - which
is not really handled by current code, would consider this not-so-urgent
TODO though.
 2017-04-19 22:07:57 +02:00
Campbell Barton
a738e985c6 Fix update drawing curve editmode 2017-04-20 05:55:48 +10:00
Bastien Montagne
1c28e12414 Fix (unreported) missing handling of GPencil Layer's parent Object pointer in BKE_library_query. 
Grrrr... still finding missing pointers here... :/
 2017-04-19 21:47:01 +02:00
Campbell Barton
72efee07ff Draw Manager: draw curve normals 2017-04-20 05:33:52 +10:00
Campbell Barton
896d62d1c2 Fix error disabling curve handles 2017-04-20 04:53:55 +10:00
Campbell Barton
43a273616b No need for while-loop counting curve-normals 2017-04-20 03:01:13 +10:00
Campbell Barton
e28a92bacb Cleanup: put overlay & wire in own structs 2017-04-20 02:53:33 +10:00
Sybren A. Stüvel
c0f9d962f0 Merge branch 'master' into blender2.8 
Updated tests/python/bl_alembic_import_test.py to be 2.8-compatible.
 2017-04-19 17:33:22 +02:00
Sybren A. Stüvel
307059ed61 Alembic import: correctly linking objects to scene layer. 
The import is always performed on the active LayerCollection. If there
is none, a new one is created.
 2017-04-19 17:30:06 +02:00
Sybren A. Stüvel
aaec934096 Alembic import: added simple unit test for importer. 
It only tests the presence of the objects and their parent/child pointers.
Matrix and animated properties should be done in a later test.
 2017-04-19 17:28:25 +02:00
Aaron Carlisle
8accea07f7 UI: Reorganize the UV/Image "Game Properties" Pannel 
This uses the same amount of room while giving it a more clean look and adds a label for the mapping options so users can tell the purpose.
 2017-04-19 11:15:41 -04:00
Sergey Sharybin
248946542d Fix alpha overlay for sculpt/paint when using core profile 
Same fundamental problem as fonts -- there is no longer GL_ALPHA format.
 2017-04-19 16:57:44 +02:00
Sergey Sharybin
e708f45eab Cleanup: Remove executable flag from GLSL shaders 2017-04-19 16:57:44 +02:00
Sergey Sharybin
553d820b80 Remove basic shader from paint cursor overlay 
Immediate mode built-in shader is used for this drawing already.
So there is no reason to try building basic shader which is not
supported in the core profile.
 2017-04-19 16:57:44 +02:00
Luca Rood
4bee5b80d4 Convert direct usages of base defines 
This replaces all direct usage of:
- FIRSTBASE
- LASTBASE
- BASACT
- OBACT

Some usages still remain in legacy utility functions which are called
all over the place.
 2017-04-19 16:52:27 +02:00
Luca Rood
2f2420709c Remove local view toggle operator 2017-04-19 16:52:27 +02:00
Campbell Barton
1427765ec5 Cleanup: remove redundant assignments 
Return the 'Batch' instead of assigning a variable.
 2017-04-20 00:52:53 +10:00
Campbell Barton
cdba73c8fa Draw Manager: curve support 
Draws the curve centerline and editmode verts/handles.

Handle theme colors, and normal display still need adding.
 2017-04-20 00:38:44 +10:00
Campbell Barton
ce6b01f203 Cleanup: move theme-id to shader-group into funcs 2017-04-20 00:26:44 +10:00
Sergey Sharybin
d8c698a76d Fix mistake in previous commit 2017-04-19 16:16:30 +02:00
Sergey Sharybin
3f11be3f7d Get rid of glMatrixMode calls 
With the explicit calls we don't need to worry about current state
outside of the GPU module now. In fact. we don't need to worry about
current matrix mode in core profile at all.

Legacy OpenGL now has some code which ensures current matrix mode
when using explicit calls to push/pop matrix.
 2017-04-19 15:22:58 +02:00
Sergey Sharybin
288892bf08 Make UI block drawing closer to master 
There is no need to break assumptions of what's being modified
by this call and what's restored. The changes in this function
simply spread crappyness outside of the UI block.
 2017-04-19 15:22:58 +02:00