Campbell Barton 15ad39e684 svn merge ^/trunk/blender -r42303:42329

2011-12-02 01:01:07 +00:00

..

intern

svn merge ^/trunk/blender -r42303:42329

2011-12-02 01:01:07 +00:00

CMakeLists.txt

pep8 edits and avoid naming conflicts with python builtins

2011-11-24 19:36:12 +00:00

GPU_buffers.h

remove header text:

2011-11-29 10:54:47 +00:00

GPU_draw.h

remove header text:

2011-11-29 10:54:47 +00:00

GPU_extensions.h

remove header text:

2011-11-29 10:54:47 +00:00

GPU_material.h

remove header text:

2011-11-29 10:54:47 +00:00

SConscript

Muting node patch: second part. Also fix [#27636] Muting shading nodes is ignored

2011-11-20 16:38:23 +00:00