Campbell Barton 48006292d8 svn merge ^/trunk/blender -r44189:44204

2012-02-17 20:56:25 +00:00

..

intern

svn merge ^/trunk/blender -r44076:44118

2012-02-15 12:08:06 +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 some silly variable copies that stuck around from a previous refactor.

2012-01-02 19:01:16 +00:00

GPU_draw.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

GPU_extensions.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

GPU_material.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

SConscript

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

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