griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
67,601 Commits 1 Branch 0 Tags
d4e7288af9caec2c5f5a2af758d265663fd75063
Commit Graph

54211 Commits

Author SHA1 Message Date
Clément Foucault
d4e7288af9 Edit Mode overlay: Update cache on selection 2017-03-06 03:58:08 +01:00
Clément Foucault
33c093ef70 Clay Engine: Fix shader linking issue 2017-03-05 20:29:21 +01:00
Clément Foucault
b36f93fa37 Clay Engine: support draw callbacks 2017-03-05 18:10:08 +01:00
Clément Foucault
ff96f527fd Edit Mode overlay: fix clear color, and possibly a crash. 2017-03-05 18:10:08 +01:00
Clément Foucault
747ac66800 Clay Engine: More Lamp drawing work 2017-03-05 18:10:08 +01:00
Clément Foucault
608b96c49b Clay Engine: camera drawing 2017-03-05 18:10:08 +01:00
Mike Erwin
76c9f1a649 OpenGL: remove fdrawcheckerboard 
This helper function was marked DEPRECATED since it uses old OpenGL calls.

Switched last 2 uses to imm_draw_checker_box, which does the same thing, only awesome.

Part of T49043
 2017-03-04 01:49:07 -05:00
Mike Erwin
a514fea932 OpenGL: remove old DrawPixels util functions 
a little bit of T49043, mostly related to T49165

Thx to @fclem for marking these as unused & making shader-based replacements.
 2017-03-03 18:18:21 -05:00
Mike Erwin
87d5f670a0 OpenGL: remove glaDrawBorderCorners 
This helper function was marked DEPRECATED since it uses old OpenGL calls.

Part of T49043
 2017-03-03 17:55:41 -05:00
Mike Erwin
0215b3e957 OpenGL: draw image render info with new imm mode (part 1) 
Part of T49043

This was the last use of glaDrawBorderCorners.

Plenty more to do in this file, I'll keep working on it...
 2017-03-03 17:53:53 -05:00
Mike Erwin
af1635eeb0 OpenGL: remove stipple pattern defines 
GPU_basic_shader handles this internally; no other code depends on it.
 2017-03-03 17:36:17 -05:00
Mike Erwin
29683d623c OpenGL: remove glutil_draw_*_arc (lined, filled) 
These helper functions were marked DEPRECATED since they use old OpenGL calls. Now they are marked GONE!

Part of T49043
 2017-03-03 17:23:35 -05:00
Mike Erwin
053589da7d OpenGL: paint_draw_cursor with new imm mode 
Part of T49043.

This was the last use of glutil_draw_lined_arc.

Plenty more to do in this file, I'll keep working on it...
 2017-03-03 17:21:34 -05:00
Mike Erwin
3fdffc1e95 Gawain: fix for MSVC 2013 
<stddef.h> defines offsetof. For some reason MSVC 2015 does not need this. Mystery!
 2017-03-03 14:50:35 -05:00
Mike Erwin
3381cf98cb OpenGL: remove fdrawbox, sdrawbox, sdrawline 
These helper functions were marked DEPRECATED since they use old OpenGL calls. Now they are marked GONE!

Part of T49043
 2017-03-03 13:26:43 -05:00
Mike Erwin
6999e82693 OpenGL: remove last uses of fdrawbox 
Part of T49043
 2017-03-03 13:22:16 -05:00
Mike Erwin
b3a4b61a3b OpenGL: remove last uses of sdrawline & sdrawbox 
Part of T49043
 2017-03-03 13:12:49 -05:00
Clément Foucault
0c5b197447 Edit Mesh overlay: remove one extra buffer. 2017-03-03 13:51:59 +01:00
Julian Eisel
2a82162618 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/armature/pose_select.c
	source/blender/editors/include/ED_armature.h
 2017-03-03 12:55:35 +01:00
Campbell Barton
c0d0ef142f Cleanup: GPU_select never took NULL rect 2017-03-03 22:24:08 +11:00
Campbell Barton
25de610876 Cleanup: redundant header, use const, short -> bool 2017-03-03 22:24:08 +11:00
Bastien Montagne
cdfae957f2 When creating texture/image in Texture Paint mode, both datablocks should get the same name 
The paint slot name was not the same as what is displayed on the texture properties panel.
Instead, the slot type (e.g. "Diffuse Color") was used as the name.

Patch by Suchaaver (@minifigmaster125) with minor changes from @mont29.

Reviewers: mont29, sergey

Maniphest Tasks: T50704

Differential Revision: https://developer.blender.org/D2523
 2017-03-03 10:50:01 +01:00
Dalai Felinto
22df0b2fe2 Fix blenderplayer building (tm) 2017-03-03 10:09:42 +01:00
Bastien Montagne
df88d54284 Fix T49655: Reloading library breaks proxies. 
Can't say enough how much I hate those proxies... their duality (sharing
some aspects of both direct *and* indirect users) is a nightmare to handle. :(
 2017-03-03 08:52:19 +01:00
Mike Erwin
8cf524cec9 plug ShaderInterface into GPUShader 
Renamed existing getter/setter that only FX shaders use. We could convert FX code to use the richer new interface or leave it as is.

Removed unused GPUShader fields. ShaderInterface tracks the same information.
 2017-03-02 21:46:54 -05:00
Mike Erwin
c2baf3e486 OpenGL: draw PBVH bounding box with new imm mode 
It wasn't using old immediate mode, but was using
- client vertex arrays (obsolete)
- quads (obsolete)
- state attrib stack (obsolete)
- polygon mode (still allowed, but gross)
 2017-03-02 21:40:13 -05:00
Mike Erwin
e0a2bd43dd Gawain: add ShaderInterface for GLSL introspection 
After a GLSL program is linked we can get all its inputs & never have to ask it again.

Several uniforms are considered "built-in". Nothing special about these to OpenGL itself, they just follow conventions of our built-in shaders.

This will help the matrix API, immediate & batch drawing APIs, and allow extra error/compatibility checking.
 2017-03-02 21:28:28 -05:00
Clément Foucault
85945849a9 Edit Mode overlay: backwire "ghost wireframe" with variable intensity 2017-03-03 02:53:16 +01:00
Clément Foucault
bb8a172dfb Draw Manager: Changed buffer uniform api. 
Use a reference to where will the texture be instead of an index.
 2017-03-03 02:53:16 +01:00
Mike Erwin
0c1c646118 clean up clay vertex shader 
Clay engine only works on modern GL, so this shader doesn't need compatibility with legacy Mac GL.
 2017-03-02 18:11:21 -05:00
Mike Erwin
33758c7cb8 Gawain: move PRIM types to new file, classify by geometry 
PrimitiveClass will help match shaders to draw calls & detect usage errors. For example a point sprite shader only makes sense with PRIM_POINTS.

Updated other files to include new primitive.h
 2017-03-02 15:07:14 -05:00
Julian Eisel
a99495d291 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/intern/scene.c
 2017-03-02 19:15:32 +01:00
Dalai Felinto
5ce6388f7c Outliner: add hooks for (yet to be implemented) layer reordering routines 2017-03-02 18:12:30 +01:00
Bastien Montagne
42cb93205c Fix own stupid mistake in recent mesh 'split_faces' rework. 
Was assigning new edge index to ml_prev->e, and then assigning ml_pre->e
to orig_index...
 2017-03-02 17:22:03 +01:00
Julian Eisel
0322700d87 Get UI ready for using drag & drop to nest a collection into another one 
Nothing happen yet when it's supposed to insert the collection into
another one, that part will be handled by @dfelinto.

See gif for demo of how it works UI wise: {F500337}

Also fixed off-by-one error in utility function.
 2017-03-02 17:15:30 +01:00
Dalai Felinto
146a88dd60 Remove all instance of OBACT from particle_edit.c and related changes 2017-03-02 17:14:59 +01:00
Dalai Felinto
209021a703 Remove all instances of OBACT from drawobject.c and related changes 2017-03-02 17:09:24 +01:00
Dalai Felinto
083bc48816 Remove OBACT from rigidbody_constraint.c and remove uneeded sanity check 2017-03-02 17:09:24 +01:00
Dalai Felinto
aa845eed1e Remove tons of OBACT 
There are now only referenced in:
* drawobject.c
* particle_edit.c
* space_image.c (a single case to be handled on workspace branch)
* rigidbody_constraint.c (to be handled in the following commit)
 2017-03-02 17:09:24 +01:00
Clément Foucault
561d11c5e6 Edit Mesh overlay: pack normals with face centers. 
Needed for face normals.
 2017-03-02 15:03:40 +01:00
Clément Foucault
0b6fa1a0fb Mesh batch cache: fix memory leak 2017-03-02 14:20:36 +01:00
Julian Eisel
a78717a72d Fix duplicated 'Accurate' property for manipulator keymap item 
Is already added through Transform_Properties
 2017-03-02 13:39:01 +01:00
Julian Eisel
e7dc46d278 Fix weird "use_planar_constraint" button in redo panel 
Issue was that the VIEW_OT_manipulator operator calls the transform
operators and passes them it's own operator properties. That means the
transform operator got properties passed that it doesn't have.
 2017-03-02 13:37:42 +01:00
Dalai Felinto
7b1de2b407 Revert "Depsgraph: Add placeholder function to handle objects update" 
This reverts commit 9023abbf27.
 2017-03-02 13:05:17 +01:00
Dalai Felinto
4bf9a65da9 Fix mesh edit wasn't updating for new objects 
The problem was that we were updating the mesh cache on
BKE_object_eval_shading, not on mesh change.
 2017-03-02 12:58:30 +01:00
Sergey Sharybin
a83a68b9b6 Threads: Use atomics instead of spin when entering threaded malloc 2017-03-02 12:42:34 +01:00
Sergey Sharybin
87f8bb8d1d Fix another part of T50565: Planar constraints were always initialized to accurate transform 
Now it is defined by keymap.
 2017-03-02 12:18:07 +01:00
Sergey Sharybin
499faa8b11 Fix second part T50565: Using planar transform once makes it enabled by default 
Was caused by property being saved by the operator manager.
 2017-03-02 11:20:57 +01:00
Mike Erwin
869f2940c2 Gawain: allow use of final 2 bits of 10_10_10_2 format 
Requested by @fclem
 2017-03-02 03:16:02 -05:00
Clément Foucault
b463cd2ab8 Edit Mode overlay: Moved Shaders to draw modules and resolved some draw issue. 
We don't want to clutter gpu_shader.c with engine specific code
Added face's center dot
Simplified loose vert shader
 2017-03-02 01:08:32 +01:00