griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
69,212 Commits 1 Branch 0 Tags
4edee280e4214cff99ef813ce656231df8bb40ea
Commit Graph

55401 Commits

Author SHA1 Message Date
Sergey Sharybin
4edee280e4 Merge branch 'master' into blender2.8 2017-05-11 16:28:58 +02:00
Sergey Sharybin
8eeb610832 Depsgraph: Fix/workaround crahs when fcu->rna_path is NULL 2017-05-11 16:28:21 +02:00
Dalai Felinto
2f8a5ed985 Remove warnings after CDDM fix 2017-05-11 16:15:26 +02:00
Dalai Felinto
bde45b5ae7 Allow building the game engine with core profile 
Note: This is not about functionality, but about using the same stub file
we are using in Blender for the game engine.
 2017-05-11 16:10:53 +02:00
Dalai Felinto
6b9ab1f7a2 Unifying access to GLEW from the Blender Game Engine 
Note: This is not about functionality, but about using the same stub file
we are using in Blender for the game engine in blender2.8.
 2017-05-11 16:08:03 +02:00
Sergey Sharybin
d58310fe37 Support drawing of solid mode CDDM with core profile 
Nothing terribly exciting, just a hackish implementation of solid mode CDDM
drawing for cases when we are building with core profile.

The goal is to be able to see SOMETHING with new OpenGL for thew guys who
tests alembic and friends in blender2.8 branch. This is a temporary solution,
the whole drawing will be reworked. Limited to hardcoded material and lighting.
Selection outline color is also hardcoded because of lack of glColor() in the
core profile.

After this commit there is no big stoppers from stop worrying about legacy
OpenGL, so we can go core profile as the only way for Blender.

While some areas will become broken after that, we'd better just fix them
after that and for now just focus on more important design work.
 2017-05-11 16:00:47 +02:00
Campbell Barton
f129e48993 Merge branch 'master' into blender2.8 2017-05-11 22:16:23 +10:00
Clément Foucault
4e7eafb86f Eevee: Fix motion blur. 2017-05-11 14:17:38 +02:00
Campbell Barton
0e0888970d Merge branch 'master' into blender2.8 2017-05-11 22:07:00 +10:00
Campbell Barton
15038975a3 Cleanup: GPU PBVH naming 
Use GPU_pbvh prefix.
 2017-05-11 22:05:19 +10:00
Campbell Barton
5ae58f8ab8 DWM: Use draw manager for sculpt PBVH drawing 
Add a shader-group type to draw
generated geometry by running a callback.
 2017-05-11 21:27:33 +10:00
Campbell Barton
0ffb19ca64 Revert "DWM: remove redundant state reset" 
Enable this for now, needs some investigation.
 2017-05-11 18:56:41 +10:00
Lukas Stockner
edd7c55796 Fix Blenderplayer stubs 
The change from 62aa925c11 wasn't included.
 2017-05-11 01:13:32 +02:00
Campbell Barton
3465f80319 DWM: remove redundant state reset 2017-05-11 08:36:17 +10:00
Campbell Barton
1e9f922c9e Merge branch 'master' into blender2.8 2017-05-11 07:53:03 +10:00
Campbell Barton
891159cea0 Merge branch 'master' into 28 2017-05-11 07:42:35 +10:00
Campbell Barton
722bcb554f Sculpt Drawing: reduce redundant color conversion 
Also replace macro with for loop.
 2017-05-11 07:39:56 +10:00
Lukas Stockner
b82954f6f4 Fix T51455: Render Layers in compositor from a different scene not working 
The code only updated nodes in the nodetree of the scene to which the render layer belongs. Therefore, when using scene B in the compositor setup of scene A, A's node wouldn't be updated.
With this fix, the update function loops over all scenes and checks them for relevant nodes.
 2017-05-10 22:39:43 +02:00
Bastien Montagne
50b67d83a9 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/makesrna/intern/rna_space.c
 2017-05-10 20:40:31 +02:00
Dalai Felinto
f305aba868 Make sure 'use_property_button_exec' can deal with arrays as well 2017-05-10 20:36:11 +02:00
Bastien Montagne
42c346028f Fix missing relation in new DEG between World and its NodeTree. 
Was preventing update in 3DView etc. when changing something in the
World's NodeTree, especially annoying in blender2.8 branch (since legacy
depsgraph has been removed there), but also affecting master.
 2017-05-10 20:35:59 +02:00
Dalai Felinto
4f80260f11 Expand the collection settings RNA API for arrays 2017-05-10 20:04:50 +02:00
Dalai Felinto
4240b67e4c Expand the collection settings API to support float arrays 
We still need to update the RNA interface to access those. But since
there is no RNA_def_property_float_array_funcs I'm not sure how many
changes this will require.
 2017-05-10 19:25:39 +02:00
Aaron Carlisle
8246246bda UI: editor menu, swap Text and node editors 
Proposed by @sebastian_k and approved by @severin over IRC.

Follows up on rB0f561da5fb77540626aec7a995314271a91acdf6
 2017-05-10 12:20:57 -04:00
Dalai Felinto
e5ec386803 Merge remote-tracking branch 'origin/master' into blender2.8 2017-05-10 17:03:27 +02:00
Dalai Felinto
62aa925c11 Fix T51354: Final take on multi-view (single view) issues 
We now handle selection and transform manipulators
(kudos to Julian Eisel to help hunting down the latter).
 2017-05-10 16:54:57 +02:00
Clément Foucault
45207bf3ce Eevee: Post process parameters. 
-Display almost all parameters.
-Made some small adjustment to motion blur to support FOV motion blur.
-Made DOF max radius a parameter.
 2017-05-10 16:03:25 +02:00
Clément Foucault
fdf2d8bb95 Eevee: Support for light path node "is camera ray" output. 2017-05-10 16:03:25 +02:00
Clément Foucault
da8b34e527 Eevee: Fix some issues 
Fix issue with manipulator contributing to depth.
Fix blender internal shader.
 2017-05-10 16:03:25 +02:00
Dalai Felinto
7902e3f1c8 Fix multi-view (single camera) selection 2017-05-10 16:00:42 +02:00
Dalai Felinto
a438750cad Fix multi-view (single camera) manipulators selection 2017-05-10 15:54:23 +02:00
Dalai Felinto
1a6b97e98f Merge remote-tracking branch 'origin/master' into blender2.8 
Note: Depth placement was working already for BI, and althugh this
commit breaks it for it, it makes it work for the draw manager engines.
 2017-05-10 15:40:08 +02:00
Dalai Felinto
90997710cc Merge commit 'origin/master (9395646c2c)' into blender2.8 2017-05-10 14:21:14 +02:00
Dalai Felinto
195d0fbae3 Fixup for multi-view single eye viewport issues 
In d2f1f80a6f I was always calling view3d_main_regio_setup_view with
NULL matrices, which is not always correct.
 2017-05-10 13:13:55 +02:00
Campbell Barton
0722e41f9e DWM: Use Gawain for sculpt drawing 
Currently only uses the simple shader.
 2017-05-10 20:35:51 +10:00
Dalai Felinto
d2f1f80a6f Partial fix to Multi-View single eye issues in viewport 
Handling depth loop for now (3d cursor positioning). Selection is a bit
more tricky.

Reported on 51354
 2017-05-10 12:21:51 +02:00
Clément Foucault
1c18d07a1c Eevee: Make Depth of field zoom invariant. 
Multiply the sensor size by the viewcamtexcofac which is basicaly how scaled is the viewport relativly to the camera frame.
 2017-05-10 00:57:53 +02:00
Clément Foucault
965571cca7 Draw Manager: Handle negative scaled meshes. 2017-05-10 00:47:27 +02:00
Clément Foucault
707756d277 Draw Manager: Extend simplification to UBOs & fix a context error. 2017-05-09 23:55:19 +02:00
Clément Foucault
8277609810 Small cleanup 2017-05-09 23:55:19 +02:00
Clément Foucault
e32ec677c3 Draw Manager: Simplify usage and check for errors. 2017-05-09 23:55:19 +02:00
Clément Foucault
9075f934aa Eevee: Initial Depth Of Field commit. 2017-05-09 23:55:19 +02:00
Clément Foucault
435f5017fa GPUCompositing: Fix comment and component count. 2017-05-09 23:55:19 +02:00
Clément Foucault
1413bee158 Draw Manager: Add additive blending. 2017-05-09 23:55:19 +02:00
Clément Foucault
26b6bd6e90 Object Mode Engine: Fix grid distance if view is camera view. 2017-05-09 23:55:19 +02:00
Clément Foucault
306603ae76 GPUTexture: Add support for 32bit textures. 2017-05-09 23:55:19 +02:00
Clément Foucault
6dc8368b8f Draw Manager: Add Triangle batching and empty batch. 
This is usefull for Depth Of Field because we don't need to store data for each sprites and just generate them when rendering.
 2017-05-09 23:55:19 +02:00
Clément Foucault
bf0ebfca1a Draw Manager: Fullscreen triangle 
Used a triangle instead of a quad for fullscreen passes.
 2017-05-09 23:55:19 +02:00
Thomas Beck
894513c7fd Fix (unreported): Crash if a right click is performed on an image datablock (open btn f.e.). 
Only access/insert the button_pointer if it's not null...
 2017-05-09 20:12:25 +02:00
Bastien Montagne
24a64cb414 Fix shadow shader to support core profile. 2017-05-09 16:30:40 +02:00