archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
97c99fb034db3b25e8a3e6fca3ab1a232d8d5b43
blender-archive/source/blender/nodes/texture
History
Bastien Montagne 204c167c72 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/mesh_convert.c
	source/blender/editors/interface/interface_eyedropper_color.c
	source/blender/editors/object/object_add.c
	source/blender/editors/space_image/image_ops.c
	source/blender/makesrna/intern/rna_image.c
	source/blender/windowmanager/intern/wm_draw.c
2018-06-11 16:02:46 +02:00
..
nodes
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
node_texture_tree.c
Merge branch 'master' into blender2.8
2018-06-11 16:02:46 +02:00
node_texture_util.c
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
node_texture_util.h
Merge branch 'master' into blender2.8
2018-06-01 18:26:42 +02:00