Fix #30270, #30265: cycles not displaying textured objects, and not rendering
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 21 Feb 2012 14:39:59 +0000 (14:39 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 21 Feb 2012 14:39:59 +0000 (14:39 +0000)
commitd47b018f8d63b4ec68428011aba0c1f04c63ca73
treeafb5e27b8b288ca3c3d947b4f6c53899d1676023
parent6a5b34bdb55c430622ec88afc9bbd79ffe85d502
Fix #30270, #30265: cycles not displaying textured objects, and not rendering
text/curve objects after the bmesh merge. Also removed a debug print.
CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/makesrna/intern/rna_object_api.c