griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
67,573 Commits 1 Branch 0 Tags
e0a2bd43dda7490f495b11acdfa2ac7fec55b4ef
Commit Graph

54185 Commits

Author SHA1 Message Date
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
Clément Foucault
aa102283da Edit Mode overlay: Added theme color via UBO. 2017-03-02 01:08:32 +01:00
Clément Foucault
043c90fdcd Edit Mode overlay: fast navigate 2017-03-02 01:08:32 +01:00
Clément Foucault
26fc6c71c4 Edit Mode overlays: separate multiple shaders for loose edges and verts 2017-03-02 01:08:32 +01:00
Luca Rood
856077618a Fix T50830: Wrong context when calling surfacedeform_bind 
The custom poll function for surfacedeform_bind seems to have caused
issues when calling it from Python. Fixed by using the generic modifier
poll function, and setting the button to be active or not in the
Python UI code instead. (there might be a better way, but for now this
works fine)
 2017-03-01 17:56:10 -03:00
Julian Eisel
0f7a664731 Fix collection renaming not checking for unique name in entire hierarchy 
Only checked for unique name in direct children of the master
collection.

Also added missing listener for outliner.
 2017-03-01 20:13:40 +01:00
Sergey Sharybin
7fcae7ba60 Task scheduler: Remove query for the pool's number of threads 
Not really happy of per-pool threads limit, need to find better
approach to that. But at least it's possible to get rid of half
of the nastyness here by removing getter which was only used in
an assert statement.

That piece of code was already well-tested and this code becomes
obsolete in the new depsgraph and does no longer exists in blender
2.8 branch.
 2017-03-01 18:00:54 +01:00
raa
ecee40e919 All drop-down buttons should use the same width 2017-03-01 19:30:18 +03:00
Julian Eisel
18684e546f Outliner: Make sure collection name is unique after renaming 2017-03-01 16:34:16 +01:00
Julian Eisel
b00b9dadd8 Outliner: Support dragging object into collection 
Doing this will add the object to the collection.
 2017-03-01 15:35:21 +01:00
Campbell Barton
c1f43c9dc6 Cleanup: warnings 2017-03-02 00:36:33 +11:00
Campbell Barton
8901263b5f Merge branch 'master' into blender2.8 2017-03-02 00:22:13 +11:00
Campbell Barton
714e85b534 Cleanup: code-style, duplicate header 2017-03-02 00:16:36 +11:00
raa
32c5f3d772 Fix text and icon positioning issues 2017-03-01 16:11:21 +03:00
Antonioya
f64df0e102 Fix error moving keyframes in graph editor after refactor base 2017-03-01 13:08:15 +01:00
Sergey Sharybin
f0cf15b5c6 Task scheduler: Remove counter of done tasks 
This was only used for progress report, and it's wrong because:

- Pool might in theory be re-used by different tasks
- We should not make any decision based on scheduling stats

Proper way is to take care of progress by the task itself.
 2017-03-01 12:45:51 +01:00
Antonio Vazquez
3626521346 Base Refactor Tasks: Fix some legacy bases for dopesheet 2017-03-01 11:41:23 +01:00
Antonio Vazquez
e142793815 Base Refactor Tasks: Change selection flags 2017-03-01 11:31:10 +01:00
Antonio Vazquez
14627cc2ee Base Refactor Tasks for gpencil filter 2017-03-01 11:21:06 +01:00
Dalai Felinto
6ee70312bb Dopesheet: fix crash when dragging keyframes 2017-03-01 10:43:04 +01:00
Julian Eisel
0b0347dcca Cleanup: Rename outliner enum 2017-03-01 11:28:17 +01:00
Julian Eisel
512fb74980 Outliner: Make deleting collections from "All Collections" mode work 2017-02-28 22:18:11 +01:00
Julian Eisel
fcbae6c3b3 Outliner: Highlight active layer collection in "All Collections" mode 2017-02-28 21:58:07 +01:00
Julian Eisel
f35907444e Cleanup: Add outliner_utils.c, move functions into it 2017-02-28 21:37:15 +01:00
Mike Erwin
3176bb8346 clean up GL / GPU #includes 2017-02-28 15:30:39 -05:00
Mike Erwin
2a8dd3c5ff remove GPU_basic_shader calls from wm_gesture 
Gestures are drawn with specific built-in shaders now.
 2017-02-28 15:30:39 -05:00
Mike Erwin
7b1e5e8620 remove unused code from interface_icons 
No longer depends on basic shader API
 2017-02-28 15:30:39 -05:00