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

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

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

..

blender.map

Fix T46799: Blender crashes when enumerating POCL devices

2015-11-27 14:48:26 +05:00

buildinfo.c

Further tweaks to buildinfo

2013-11-15 18:05:27 +06:00

CMakeLists.txt

MSVC Runtime copy : Remove erroneously left in diagnostic message from CMakeLists.txt

2016-11-05 14:04:23 -06:00

creator_args.c

GPU_basic_shader uses GLSL by default

2016-09-21 20:24:02 +02:00

creator_intern.h

Cleanup split creator.c

2016-02-28 05:23:48 +11:00

creator_signals.c

Refactor BKE_blender into separate headers

2016-04-25 19:27:45 +10:00

creator.c

Merge branch 'master' into blender2.8

2016-09-04 16:41:06 +02:00

osx_locals.map

OSX: make some more symbols global only, this may prevent clashes on older systems and is good for loading times anyway.

2014-09-19 15:00:15 +02:00