Campbell Barton
2457d4f5ab
svn merge ^/trunk/blender -r42680:42722
2011-12-19 10:40:48 +00:00
Antony Riakiotakis
b8e96e70dc
better to generate the library string always because it could lead to null pointer dereferences. I don't have a non-shader system to check so skipping the conditional just to be safe
2011-12-17 13:02:31 +00:00
Antony Riakiotakis
7d2fbfeb9f
move GPU_code_generate_glsl_lib to GPU_extensions_init. This makes more sense as we cleanup the library string in GPU_extensions_exit. Thanks to Mitchel Stokes for reporting and proposing this
2011-12-17 12:58:20 +00:00
Campbell Barton
5c6ee6b523
svn merge ^/trunk/blender -r42670:42680
2011-12-17 02:41:53 +00:00
Campbell Barton
ad96dacbc5
style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code)
...
also split some long lines in own code.
2011-12-17 00:52:36 +00:00
Campbell Barton
db6cb30941
svn merge ^/trunk/blender -r42669:42670
2011-12-16 23:50:55 +00:00
Campbell Barton
e5b1f9c28d
svn merge ^/trunk/blender -r42660:42669
2011-12-16 23:26:29 +00:00
Brecht Van Lommel
3311164b24
Math lib: matrix multiplication order fix for two functions that were
...
inconsistent with similar functions & math notation:
mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B)
mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B)
For branch maintainers, it should be relatively simple to fix things manually,
it's also possible run this script after merging to do automatic replacement:
http://www.pasteall.org/27459/python
2011-12-16 19:53:12 +00:00
Campbell Barton
2253b63c97
static functions for getting power of 2 values were being copied about too much, add to the BLI_math api.
...
- is_power_of_2_i
- power_of_2_min_i
- power_of_2_max_i
2011-12-16 09:25:07 +00:00
Campbell Barton
862dc635ed
svn merge ^/trunk/blender -r42617:42655
2011-12-15 23:59:02 +00:00
Antony Riakiotakis
6ccc605660
Bicubic bump map filtering.
...
This commit introduces bicubic bump map capabilities for the viewport for OpenGL 3.0+ capable GPUs.
To use the functionality change the bump mapping method to "best quality"
Previous "best quality" setting becomes "medium quality" now.
For non OpenGL 3.0 GPUs this becomes the same as "medium quality"
Also:
* added tooltip descriptions to the bump method settings.
* modified the shader to ommit extraneous matrix multiplications for matrices already provided by OpenGL.
Bicubic shader by Morten Mikkelsen. Thanks a lot!
Oh...and FIRST!
2011-12-15 13:58:09 +00:00
Campbell Barton
65f3b93f14
svn merge ^/trunk/blender -r42521:42550
2011-12-10 05:38:00 +00:00
Joshua Leung
3f39fde373
Compile fix for r.42546 typo
2011-12-10 03:24:19 +00:00
Campbell Barton
ae17390b77
picky edits & regen man page
2011-12-10 01:07:22 +00:00
Morten Mikkelsen
82b9e4d16f
verify existence of dm
2011-12-10 01:00:12 +00:00
Morten Mikkelsen
965c287630
fixes scale on derivative maps
2011-12-09 23:26:06 +00:00
Campbell Barton
980e68175b
svn merge ^/trunk/blender -r42495:42516
2011-12-08 17:32:37 +00:00
Brecht Van Lommel
a5fb261016
Fix #29520 : issue drawing with VBO + GLSL + alpha pass. Includes some refactoring
...
to hopefully make alpha material drawing code more clear.
2011-12-07 22:03:49 +00:00
Campbell Barton
15ad39e684
svn merge ^/trunk/blender -r42303:42329
2011-12-02 01:01:07 +00:00
Brecht Van Lommel
b7db2587fb
Cycles: fix glsl error when using light path node.
2011-12-01 19:31:36 +00:00
Andrew Wiggin
bc9b593909
More DM func renames, fixing some build breaks, renaming more stuff, also seems like it might be fixing the recent CDDM_copy corruption/leak bug
2011-11-30 18:03:56 +00:00
Campbell Barton
faa022563d
svn merge ^/trunk/blender -r42245:42261
2011-11-29 18:18:56 +00:00
Campbell Barton
f62ad8f69b
remove header text:
...
"The Blender Foundation also sells licenses for use in proprietary software under the Blender Licens"
also remove NaN references from files that have been added since blender went opensource.
2011-11-29 10:54:47 +00:00
Campbell Barton
2d71eab5aa
fix [ #29256 ] Import images as planes add on doesn't work correctly in bmesh
2011-11-24 22:40:43 +00:00
Campbell Barton
4b3976cc5a
svn merge ^/trunk/blender -r42116:42139
2011-11-24 20:01:45 +00:00
Campbell Barton
6e28ac2d7b
pep8 edits and avoid naming conflicts with python builtins
2011-11-24 19:36:12 +00:00
Campbell Barton
f9e00b5c99
svn merge ^/trunk/blender -r42009:42053
2011-11-22 11:51:42 +00:00
Bastien Montagne
6673c76e78
Muting node patch: second part. Also fix [ #27636 ] Muting shading nodes is ignored
...
Now, compositing, shading and texture nodes have a consistent muting system, with default behaving as previous (for compo), and which can be optionaly customized by each node.
Shader nodes are also GLSL muted.
However, Cycles is currently unaware of muted nodes, will try to address this…
2011-11-20 16:38:23 +00:00
Campbell Barton
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
Campbell Barton
e59ab6486f
svn merge -r41751:41779 ^/trunk/blender
2011-11-15 02:05:32 +00:00
Brecht Van Lommel
e731ffb648
Cycles: Oren-Nayar BSDF support. This is not a separate shader node, rather it
...
is available through the Roughness input on the Diffuse BSDF.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#Diffuse
Patch by Yasuhiro Fujii, thanks!
2011-11-14 17:31:47 +00:00
Brecht Van Lommel
74387f44af
Fix #29252 : GLSL not working with geometry material node after recent changes.
2011-11-14 12:47:47 +00:00
Campbell Barton
e84c0980a3
correct indentation and some whitespace edits (no functional changes)
2011-11-11 13:09:14 +00:00
Campbell Barton
094c9799f9
quiet -Wdouble-promotion warnings
2011-11-11 12:00:08 +00:00
Campbell Barton
685041d53a
svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs
2011-11-10 03:05:11 +00:00
Campbell Barton
ee1828be19
svn merge -r41649:41650 ^/trunk/blender
2011-11-10 01:58:48 +00:00
Brecht Van Lommel
28ee0f9218
Texturing: texture and 3d view draw type changes, these should only have any
...
effect for a render engine using new shading nodes. In short:
* No longer uses images assigned to faces in the uv layer, rather the active
image texture node is what is edited/painted/drawn.
* Textured draw type now shows the active image texture node, with solid
lighting.
* Material draw mode shows GLSL shader of a simplified material node tree,
using solid lighting.
* Textures for modifiers, brushes, etc, are now available from a dropdown in
the texture tab in the properties editor. These do not use new shading nodes
yet.
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
Brecht Van Lommel
db75cc4cde
Nodes: add cycles shader nodes, these will only be available to render engines
...
that use the new shading nodes system. Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes
2011-11-08 11:38:16 +00:00
Campbell Barton
b0a21add8a
replace bmesh specific macros with math functions, also some pedantic formatting edits.
2011-11-07 09:02:10 +00:00
Campbell Barton
7508540c53
svn merge -r41575:41602 ^/trunk/blender
2011-11-07 07:01:24 +00:00
Campbell Barton
96d73bfdcf
replace VECCOPY with copy_v3_v3, same for 2d copy, also added vec copy functions for int & char.
2011-11-07 01:38:32 +00:00
Campbell Barton
85540d5aa7
more macro --> BLI math lib, mainly replace VECCOPY in render and blenkernel.
2011-11-06 16:38:21 +00:00
Campbell Barton
e936c78251
svn merge ^/trunk/blender -r41503:41575
2011-11-06 10:38:44 +00:00
Nicholas Bishop
a71e2c498c
GPU Buffers
...
Small type cleanup, use `GPU_Buffers *' rather than `void *'. Should
be no functional changes.
2011-11-05 03:29:37 +00:00
Campbell Barton
bd86ba2c88
svn merge -r41335:41371
2011-10-30 01:27:49 +00:00
Brecht Van Lommel
ed77c356fc
Fix: OpenGL renders on graphics cards which do not support non-power-of-two
...
textures were stretched and the wrong size.
2011-10-28 16:57:06 +00:00
Campbell Barton
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
Campbell Barton
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
Campbell Barton
aa6d7ebd14
svn merge ^/trunk/blender -r40720:40872
2011-10-09 07:31:15 +00:00
Campbell Barton
8695bedda2
svn merge ^/trunk/blender -r40644:40720
2011-10-06 16:59:58 +00:00
