Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
68,455 Commits 2 Branches 0 Tags
dc1499ba1c705506409466dfe981621d0b209eff
Commit Graph

68455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Campbell Barton
dc1499ba1c Merge branch 'master' into 28 2017-04-12 14:23:47 +10:00
Campbell Barton
0ebe08af34 Docs: minor improvement to code example 2017-04-12 14:21:59 +10:00
Campbell Barton
ed8c71da1c Cleanup: replace char array with struct 2017-04-12 14:08:44 +10:00
Campbell Barton
5cf090ffec EditMode: remove edge-hash from MeshRenderData 
LoopTri's can access this data.
 2017-04-12 13:45:56 +10:00
Campbell Barton
e78412c905 Cleanup: use const pointer for view access API 2017-04-12 12:10:01 +10:00
Campbell Barton
95dd478e47 Cleanup: line length 
Avoid right-shift
 2017-04-12 12:05:11 +10:00
Mike Erwin
42349f6efd fix compile warnings 2017-04-11 19:35:30 -04:00
Campbell Barton
e8ddd258ef Correct own error in adding colors 
Make comment regarding GLSL more clear.
 2017-04-12 00:56:19 +10:00
Sergey Sharybin
5a4fceff1b Make image drawing code working with core profile 
The issue was caused here by usage of deprecated GL_CURRENT_PROGRAM
which was returning rubbish value.

Now we use imm API and create vertex format prior to immBindProgram.
This made us required to have some sort of state passed from setup
function to actual drawing.
 2017-04-11 16:49:39 +02:00
Dalai Felinto
35ee9db1e2 Renaming: sl > scene_layer 2017-04-11 16:49:32 +02:00
Dalai Felinto
4fe4c82dbd Fix blenderplayer(tm) 2017-04-11 16:24:59 +02:00
Clément Foucault
70e4f1e003 Draw Manager: Fix blended color. 2017-04-11 16:13:29 +02:00
Clément Foucault
181c8f8ccd Draw Manager: Fix Background sets not being drawn. 2017-04-11 16:13:29 +02:00
Dalai Felinto
aef4519c8a Renaming: sl > scene_layer 2017-04-11 16:09:30 +02:00
Dalai Felinto
6f8c838b78 Cleanup: remove no longer needed BASE_ defines 2017-04-11 15:51:18 +02:00
Dalai Felinto
9a303d5db7 Bring snapping back (Base / BaseLegacy) 2017-04-11 15:46:01 +02:00
Sergey Sharybin
513aacbdb6 Use immediate mode API for OpenColorIO 2017-04-11 15:39:04 +02:00
Bastien Montagne
fd5b882a67 Move cage_manipulator.c to new GL code. 
Note: I’d assume gawain equivalent to glDrawArrays would be batches? But
for two lines drawn twice this looks totally overkill anyway, so
switched back to basic immediate-mode-like API.

A bit frustrating to work on this code, since afaict you cannot check
the results in Blender, being mostly unused currently...
 2017-04-11 15:19:00 +02:00
Bastien Montagne
b8c4be0844 FIx copy/paste mistake in own previous commit. 2017-04-11 15:19:00 +02:00
Campbell Barton
85f81293c4 GL/WIP: fix crash drawing text object 
Note that this doesn't set the normal as it should (noted as a TODO),
just committing to avoid the crash.
 2017-04-11 22:46:56 +10:00
Campbell Barton
88fddd118f Draw Manager: replace varargs with a pointer array 
Allows to ensure correct number of args
 2017-04-11 21:20:18 +10:00
Bastien Montagne
7c4e164ff3 Get rid of last deprecated OpenGL calls in arrow_manipulator.c 
Hope that makes sense...
 2017-04-11 12:47:38 +02:00
Bastien Montagne
633a2a3592 Move arrow2d_manipulator to new immediate mode GL. 2017-04-11 12:46:49 +02:00
raa
31bdb31ecf Fix: width of UILayout.prop_enum() buttons 2017-04-11 13:25:46 +03:00
Mai Lavelle
d097c72f81 Cycles: Only calculate global size of split kernel once to avoid changes 
Global size depends on memory usage which might change during rendering.
Havent seen it happen but seems possible that this could cause the global
size to be different than what was used for allocating buffers.
 2017-04-11 03:26:18 -04:00
Mai Lavelle
1e6038a426 Cycles: Implement automatic global size for CUDA split kernel 
Not sure this is the best way to do things for CUDA but its much better than
being unimplemented.
 2017-04-11 03:11:18 -04:00
Campbell Barton
9d00b7680f Uncomment deselected center point color 2017-04-11 15:48:54 +10:00
Campbell Barton
e199eae39d Draw Manager: Add center-color for linked/multiuser objects 
Draws a blue center circle for library objects.
As with regular drawing, this uses a hard-coded color.
 2017-04-11 14:05:39 +10:00
Campbell Barton
3722da3b4e Cleanup: quiet harmless but annoying overflow 
Caused asan to print warnings generating RNA
 2017-04-11 11:49:21 +10:00
Campbell Barton
c8e2436734 Merge branch 'master' into blender2.8 2017-04-11 11:01:16 +10:00
Campbell Barton
532b2786e2 Remove redundant glColor call 2017-04-11 10:47:00 +10:00
Lukas Stockner
ef816f9cff Cycles: Fix the AO replacement option in the split kernel 
Currently the code for it was inside the hair-specific part, so it wouldn't be enabled in hairless renders.
 2017-04-11 01:07:49 +02:00
Aaron Carlisle
8b0fbb909b UI: Add missing UV tools in the UV/Image Editor Window > Tools tab 
Original Author: @xrg
Changes By @blendify

Image of patch: {F284237}
 2017-04-10 18:37:03 -04:00
Aaron Carlisle
8ac7510a4d UI: Do not put walk navigation settings inside an if statement 
The issue here is that the preferences are still used because both can be accessed from the 3D View, view menu. In the future, it is likely that the old mode will be removed (maybe 2.8?) but for now we want to keep both operational.

Differential revision: https://developer.blender.org/D2320
 2017-04-10 17:44:03 -04:00
Clément Foucault
016790b3b0 Object Engine: Fix Selected Group Objects color. 2017-04-10 22:23:50 +02:00
Clément Foucault
4f063dc4dd Object Engine: Ported Force Field object drawing. 2017-04-10 22:23:50 +02:00
Mike Erwin
fb1ecbc2da Gawain: remove PRIM_QUADS_XXX 
Thanks @mont29 for finishing off the last few QUADS in blender.
 2017-04-10 16:20:24 -04:00
Bastien Montagne
f0404c3382 Get rid of last PRIM_QUAD usage, in blf_font.c/blf_glyph.c. 2017-04-10 21:21:38 +02:00
Bastien Montagne
c9685a148f Nuke three remaining uages of PRIM_QUAD in drawobject.c 
This was slightly less obvious, especially particle billboard drawing.
That one now requires 1.5 times more space in VBOs and ParticleDrawData
buffers, since we have to draw two triangles per particle, instead of a
single quad... And diagonal of each quad is now drawn in wire mode, not
sure how much we consider this an issue (as in, will this particle draw
code change a lot in future?).

From quick check on the web seems there is no other way to do anyway. :/
 2017-04-10 20:33:09 +02:00
Bastien Montagne
490fea6107 Minor cleanup/fix for own rB45f3150c9844326 merge. 2017-04-10 18:52:35 +02:00
Campbell Barton
d8fa3dd7c3 GL: use imm* module for 2D cage manipulator 2017-04-11 02:32:53 +10:00
Campbell Barton
304935e02a GL/playanim: use immediate mode wrapper, replace glDrawPixels 2017-04-11 02:05:53 +10:00
Bastien Montagne
45f3150c98 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/space_view3d/drawobject.c
 2017-04-10 17:34:31 +02:00
Bastien Montagne
2ad1124372 Fix stereoscopic camera volume drawing. 
Not sure how we got to that point, but code was drawing twice one side
of the camera volume, and not at all another side!
 2017-04-10 17:31:39 +02:00
Clément Foucault
5f70116030 OpenGL: Fix textureXd deprecated calls. 2017-04-10 16:59:20 +02:00
Clément Foucault
01bd6da68f Draw Manager: Add Manipulator Back. 2017-04-10 16:59:20 +02:00
Bastien Montagne
9a38a6bdab GPencil 2D Drawing: get rid of PRIM_QUAD_XXX. 
Here we can easily use a PRIM_TRIANGLE_STRIP instead!
 2017-04-10 16:54:21 +02:00
Bastien Montagne
346964eb3f Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/editors/gpencil/drawgpencil.c
 2017-04-10 16:53:12 +02:00
Sergey Sharybin
c8e764ccbf Cycles: Fix race condition in shader attribute for real now 
Ended up moving lock in the more centralized space since multiple shaders
can access this map.
 2017-04-10 16:53:01 +02:00
Bastien Montagne
fd203a0933 GPencil 2D drawing code: minor optimization. 
Do not recompute both points's 2D coordinates for each segments, we can
copy over from previous one... Does not gives any measurable speedup off
hands, though.
 2017-04-10 16:30:05 +02:00