fix for crashing when unlinking a world from a scene

This commit is contained in:
Campbell Barton
2009-10-19 19:17:05 +00:00
parent 631fbf88e8
commit 0ce2950649

View File

@@ -114,6 +114,8 @@ static int buttons_context_path_scene(ButsContextPath *path)
return RNA_struct_is_a(ptr->type, &RNA_Scene);
}
/* note: this function can return 1 without adding a world to the path
* so the buttons stay visible, but be sure to check the ID type if a ID_WO */
static int buttons_context_path_world(ButsContextPath *path)
{
Scene *scene;
@@ -372,7 +374,7 @@ static int buttons_context_path_texture(const bContext *C, ButsContextPath *path
else if((path->flag & SB_WORLD_TEX) && buttons_context_path_world(path)) {
wo= path->ptr[path->len-1].data;
if(wo) {
if(wo && GS(wo->id.name)==ID_WO) {
tex= give_current_world_texture(wo);
RNA_id_pointer_create(&tex->id, &path->ptr[path->len]);