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

55153 Commits

Author SHA1 Message Date
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
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
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
Sybren A. Stüvel
dc27d31a21 Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8 
# Conflicts:
#	source/blender/alembic/intern/abc_exporter.cc
 2017-04-26 16:50:29 +02:00
Sergey Sharybin
e6954a5a7c Fix race condition invalidating object data's bounding box 2017-04-26 16:00:02 +02:00
Sergey Sharybin
e61ba39e7c Ensure task scheduler exists before any threading starts in Blender 2017-04-26 16:00:02 +02:00
Sergey Sharybin
e2f8bb56d6 Avoid race condition copying Scene for off-thread OpenGL image save 2017-04-26 16:00:02 +02:00
Sergey Sharybin
146db944e5 Threading: Remove thread lock which seems useless 
Render data is never guarded by image drawe lock.
 2017-04-26 16:00:02 +02:00
Campbell Barton
449ad35093 Move depth select loop into its own function 
Useful for splitting out draw logic in 2.8x
 2017-04-27 00:01:23 +10:00
Sybren A. Stüvel
6ed15c5a41 Alembic export: support simple child hairs (Fix T51144) 
Simple child hairs don't have a face index number assigned, so the
call to dm->getTessFaceData(dm, num, CD_MFACE) would cause a crash. To
work around this, UV and normal vectors are copied from the parent
hair.

I've also removed an unnecessary call to dm->getTessFaceArray(dm);

Reviewers: kevindietrich

Differential Revision: https://developer.blender.org/D2638
 2017-04-26 15:31:03 +02:00
Sybren A. Stüvel
51e3a184ea Alembic: fixed indentation 2017-04-26 15:19:37 +02:00
Sybren A. Stüvel
ef80164e1c Alembic: fixed memory leaks 2017-04-26 15:19:37 +02:00
Sybren A. Stüvel
20621d46d1 Alembic: fixed refcount issue when duplicating imported objects 
Duplicating an imported object didn't increment the cache reader's refcount,
whereas removing the duplicate did decrement it. This caused problems.
 2017-04-26 15:19:37 +02:00
Sybren A. Stüvel
ff1f115706 Fix T51280: Alembic: Crash when removing cache modifier 
The calls to id_us_plus/min were unnecessary (and caused assertion
failures) as this is already taken care of by transformcache_id_looper().
 2017-04-26 15:19:37 +02:00
Bastien Montagne
7517cf6bbb Getting rid of setlinestyle: 3DView ruler. 2017-04-26 15:19:03 +02:00
Bastien Montagne
75e9d59b96 Getting rid of setlinestyle: non-camera 3DView render border. 
Also fixed wrong color for in-camera render border, and added a comment
to imm_cpack about expected color components order in integer parameter.
 2017-04-26 15:19:03 +02:00
Dalai Felinto
e791e01c0b Fix material preview for Cycles and BI 
I had to update the .blend files too, and get them to use collections over the nameless old layers.
 2017-04-26 14:37:18 +02:00
Campbell Barton
b38d87fbaf Last commit broke object-armature select 2017-04-26 22:39:12 +10:00
Campbell Barton
aca6a12330 Draw Manager: pose-bone selection 2017-04-26 22:28:42 +10:00
Campbell Barton
f351cb5479 Avoid platform dependant PATH_MAX 2017-04-26 21:06:00 +10:00
Bastien Montagne
ec442224df Getting rid of setlinestyle: Squencer space. 
Not much to add here, except that it needs the scale of its MVP matrix
to be taken into account here...

Reviewers: merwin, dfelinto

Differential Revision: https://developer.blender.org/D2647
 2017-04-26 12:26:30 +02:00
Sybren A. Stüvel
9b3e3d4def Alembic export: also export empties 
Exporting an empty creates an Alembic XForm object. The empties can also
be animated.
 2017-04-26 12:26:21 +02:00
Sybren A. Stüvel
afe1c25d06 Alembic export: renamed func object_is_shape → object_type_is_exportable 
The function doesn't return whether the object is a shape at all, since
it also returns true for camera objects (and soon also for empties). It
returns true when objects of this type can be exported to Alembic at all.
This is now reflected in the name.
 2017-04-26 12:25:45 +02:00