griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
68,928 Commits 1 Branch 0 Tags
b2178472e95e777b4e61c77c18ee90eb8a22cbca
Commit Graph

55173 Commits

Author SHA1 Message Date
Campbell Barton
b2178472e9 Disable custom armature colors 2017-04-29 04:26:31 +10:00
Campbell Barton
04f43d4cdf Merge branch 'master' into blender2.8 2017-04-29 03:39:24 +10:00
Bastien Montagne
ba4f47ce8e Getting rid of setlinestyle: Clip drawing code. 
This one has been painful, it's doing lots of nifty conditional drawing
of all kind... Also, very nice illustration of how cumbersome it is to
use dashed shader currently, we really need to find a simpler way at
some point imho. But this is not critical issue either, for now we can
live with some uglyness like that. :/
 2017-04-28 19:22:45 +02:00
Bastien Montagne
9fe19437e9 Getting rid of setlinestyle: markers' dashed line in VSE. 2017-04-28 19:22:45 +02:00
Campbell Barton
af3f7db4ec Fix T51324: Auto-Depth fails rotating out of camera 2017-04-29 03:21:03 +10:00
Sybren A. Stüvel
074c5f0d26 Merge branch 'master' into blender2.8 2017-04-28 15:52:07 +02:00
Campbell Barton
08142dde2c Hide object center and other info when drawing sets 2017-04-28 23:52:02 +10:00
Sybren A. Stüvel
aa88796a6c Alembic: use object-oriented approach in ABC_read_mesh() 
This is easier to extend than the if/else if/else chain that was in place,
and allows for somewhat more granular error messages.
 2017-04-28 15:33:57 +02:00
Sybren A. Stüvel
2e67a20045 Alembic: Construct ISampleSelector once and pass along 2017-04-28 15:33:57 +02:00
Campbell Barton
886966aa38 Correct comment, we need wire_outline data in this case 2017-04-28 23:04:29 +10:00
Campbell Barton
0e94d91048 Draw Manager: pose-mode custom bone display 2017-04-28 22:31:58 +10:00
Campbell Barton
cc43dd054f Recent commit state broke lattice vertex drawing 
e4d856e3 caused lattice vertices not to draw in editmode.
 2017-04-28 18:43:46 +10:00
Campbell Barton
226b6e60b9 Fix draw manager draw-modes interfering with eachother 2017-04-28 05:22:30 +10:00
Campbell Barton
a680bcd13b Draw Manager: basic text overlay support 2017-04-28 04:54:04 +10:00
Mike Erwin
e4d856e31b OpenGL: manage legacy state only when WITH_LEGACY_OPENGL=ON 
- enabled lights
- alpha test
- texture environment
- point sprites (always enabled in modern GL)

Moved is_clip_plane for better struct packing, no functional change there.

Part of T51164
 2017-04-27 14:32:47 -04:00
Mike Erwin
079e0b5943 OpenGL: don't set texture LoD bias via glTexEnvf 
Not supported in core profile. We could do this in GLSL if it's really needed.

Part of T51164
 2017-04-27 14:24:32 -04:00
Mike Erwin
0d5c5a8438 OpenGL: early exit from functions that don't mix with core profile 
These parts will not be part of final viewport, but are called indirectly during the transition. To avoid runtime errors on core profile, exit early -- functions effectively do nothing.

I put the early exits inside the functions to avoid cluttering the code that calls these. But (long term) the calling functions need to change.

Basic shader's detect_options function was unused and full of old, so I deleted it.

Part of T51164
 2017-04-27 14:21:12 -04:00
Mike Erwin
99fde39f49 OpenGL: fix color logic op 
GL_LOGIC_OP is a synonym for GL_INDEX_LOGIC_OP, from OpenGL 1.0's indexed color drawing. It's not part of modern GL and causes an error in core profile.

GL_COLOR_LOGIC_OP is still supported in the latest GL. It's the last stage before writing to the framebuffer.

Part of T51164
 2017-04-27 14:19:03 -04:00
Campbell Barton
87a66864bc Add back text color for legacy drawing 2017-04-28 03:05:24 +10:00
Mike Erwin
741ed16d13 OpenGL: don't glGet(GL_RED_BITS) in core profile 
or GREEN or BLUE. These are deprecated and cause errors under core profile.

TODO: get color depth value another way

Part of T51164
 2017-04-27 11:43:25 -04:00
Mike Erwin
bfaf7a3eb1 OpenGL: stop enabling GL_TEXTURE 
Texturing is always enabled in GLSL. Simply use a sampler in the shader.

Replaced gpu_generate_mipmap with glGenerateMipmap since the former just Enabled/Disabled the texture target and called the latter.

Part of T51164
 2017-04-27 11:24:35 -04:00
Mike Erwin
a49708a691 OpenGL: stop using GL_NORMALIZE 
With GLSL there is no need for GL_NORMALIZE. We explicitly normalize in the shader, or (better) send in unit vectors.

Part of T51164
 2017-04-27 10:35:12 -04:00
Mike Erwin
1dbb41f195 OpenGL: restore all 8 lights 
fixes a copy/paste mistake
 2017-04-27 09:30:48 -04:00
Mike Erwin
5c7b8cfffa OpenGL: remove GL_MAP1_VERTEX_3 
This is related to OpenGL evaluators (old feature). From my understanding, we don't seem to be actually using it.

Part of T51164
 2017-04-27 09:30:48 -04:00
Bastien Montagne
cbaacc08dc Getting rid of setlinestyle: transform code. 
Note that I also made 'dash anchor point' consistent (the static one,
not the mouse one), in previous code somtimes dashed were anchored to
the static center point, in others, to the moving mouse position, the
later was rather disturbing imho...
 2017-04-27 15:28:30 +02:00
brunoT
a85f457195 Fix: T50271: Bilateral/Directional blur's iterations is zero by default 
Differential Revision: https://developer.blender.org/D2632
 2017-04-27 09:00:11 -04:00
Campbell Barton
b649f53a62 Error in last commit 2017-04-27 22:01:31 +10:00
Campbell Barton
23b8fa5299 Cleanup: split cmake source/headers 2017-04-27 21:58:43 +10:00
Campbell Barton
e9ccc98877 Revert "Fix T51328: Add note to cmdline help that threads must be first" 
The help message already notes that argument order matters,
and this doesn't need to be the first.
 2017-04-27 21:48:06 +10:00
Campbell Barton
98b6c6f2c0 Merge branch 'master' into blender2.8 2017-04-27 21:42:08 +10:00
Campbell Barton
ed14c15b7a Cleanup: remove unused matrix arg 2017-04-27 21:41:03 +10:00
Campbell Barton
21d31f8f58 3D widgets were obscured by view geometry 2017-04-27 19:43:27 +10:00
Campbell Barton
acec2a92ef Pose-mode drawing used alpha where it shouldn't 2017-04-27 19:31:19 +10:00
Campbell Barton
a845fc0d39 Fix gpuScaleUniform (caused strange pose-bone size) 2017-04-27 18:44:57 +10:00
Campbell Barton
f4c548ce2b Use pose-mode colors for pose-bone drawing 
Also move static vars into structs
 2017-04-27 18:17:47 +10:00
Campbell Barton
2d11d7c570 Cleanup: use doxy groups for armature 2017-04-27 17:06:52 +10:00
Campbell Barton
a4b97390d9 Fix basic pose-mode select drawing 2017-04-27 16:57:11 +10:00
Campbell Barton
58e61446df Fix wrong scene assigned when using sets 
Depsgraph was left with wrong set-scene.
 2017-04-27 16:21:56 +10:00
Campbell Barton
4afbd08941 Fix/workaround crash with non mesh geometry 
eevee was crashing on curve grometry, draw without material for now.
 2017-04-27 15:56:04 +10:00
Aaron Carlisle
a6b9bd023b Fix T51328: Add note to cmdline help that threads must be first 2017-04-26 22:48:18 -04:00
Bastien Montagne
4b682fa3e7 Getting rid of setlinestyle: Paint 'line' strokes. 2017-04-26 21:22:05 +02:00
Bastien Montagne
cf959dc03a Getting rid of setlinestyle: armature drawing code. 
Firts usage of 3D version of new dashed line shader... Though not sure
whether that code will be kept for long?
 2017-04-26 20:57:18 +02:00
Bastien Montagne
bb43dff935 Add 3D version of dashed line shader. 
This is actually nearly same code as 2D version, maybe we can
deduplicate that later?
 2017-04-26 20:57:18 +02:00
Bastien Montagne
224f148e22 2D dashed line shader: changed to use viewport side instead of scale. 
The scale version was working(ish), but it was not really extendable to
a 3D line version of the shader.

Also note that sequencer view still keeps its 'UI scale' adaptation
(dashes grow together with UI scale setting). Would be nice to do that
everywhere ultimately imho, but nothing urgent here.
 2017-04-26 20:57:18 +02:00
Campbell Barton
795e839d3b Cleanup: rename select engine -> basic 
This is used by depth drawing too and had no selection specific code.
 2017-04-27 02:51:07 +10:00
Campbell Barton
a7c5d2e159 Pass graph to depth functions 2017-04-27 02:36:56 +10:00
Campbell Barton
edd1512741 Draw Manager: cleanup, use doxy categories 
Also add DRW_state for accessing current draw state.
 2017-04-27 02:04:56 +10:00
Campbell Barton
7631f4bf6d Draw Manager: use engine drawing for depth drawing 2017-04-27 01:43:05 +10:00
Campbell Barton
f59d3a7b0c View3D: move depth drawing into own function 
No functional changes
 2017-04-27 01:01:43 +10:00
Campbell Barton
c9d4a0930b Merge branch 'master' into 28 2017-04-27 00:58:28 +10:00