Merge pull request #1286 from marcoll/master

Avoid the use of the new GP editor as a cheating aid
Fix crash when loading instanced node without texture.