Germano 790025c01e Merge branch 'master' into blender2.8 ... # Conflicts: # intern/cycles/blender/blender_mesh.cpp # source/blender/editors/screen/screen_ops.c # source/blender/editors/space_view3d/drawobject.c		2018-01-21 18:45:47 -02:00
..
composite	Merge branch 'master' into blender2.8	2018-01-08 09:39:32 +01:00
intern	Merge branch 'master' into blender2.8	2018-01-21 18:45:47 -02:00
shader	Merge branch 'master' into blender2.8	2017-12-07 23:53:03 +11:00
texture	Merge branch 'master' into blender2.8	2018-01-08 09:39:32 +01:00
CMakeLists.txt	Merge branch 'master' into blender2.8	2017-11-08 00:20:59 +01:00
NOD_common.h	correct include guards and add checks in check_style_c.py for them.	2013-09-19 23:17:52 +00:00
NOD_composite.h	Rename any instance of scene layer or render layer in code with view layer	2017-11-23 07:48:23 -02:00
NOD_shader.h	Merge branch 'master' into blender2.8	2017-11-08 00:20:59 +01:00
NOD_socket.h	Add utility function to copy default values from one tree to another	2017-08-29 12:55:03 +02:00
NOD_static_types.h	Merge branch 'master' into blender2.8	2017-11-08 00:20:59 +01:00
NOD_texture.h	Removed some unused old function declarations for loop node register, awkward that this is still there ...	2013-09-02 10:34:27 +00:00