Bastien Montagne c1ba58c44d Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/blender/addon/properties.py

2016-11-07 15:46:27 +01:00

..

intern

Merge branch 'master' into blender2.8

2016-11-07 15:46:27 +01:00

rna_cleanup

switch verious references from py3.2 -> 3.3 or just 3.

2012-11-26 13:58:06 +00:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

RNA_access.h

Merge branch 'master' into blender2.8

2016-09-23 01:40:19 +02:00

RNA_define.h

Fix T46900: Inset Faces Thickness & Depth Do Not Use Scene Units (i.e. Imperial).

2015-12-01 01:09:38 +01:00

RNA_documentation.h

…

RNA_enum_types.h

Merge branch 'master' into blender2.8

2016-08-06 12:45:03 +02:00

RNA_types.h

Py-Driver: add 'self' option

2016-07-30 16:46:13 +10:00