archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for crash when setting layers or saving when there is no active scene - only really happens when running python scripts on startup.

Browse Source
This commit is contained in:
Campbell Barton
2011-07-04 05:23:36 +00:00
parent d29d3a89e4
commit 0e0eba9f79
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/makesrna/intern/rna_object.c
View File

@@ -270,11 +270,16 @@ static void rna_Base_select_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Po
static void rna_Object_layer_update__internal(Main *bmain, Scene *scene, Base *base, Object *ob)
{
/* try to avoid scene sort */
if((ob->lay & scene->lay) && (base->lay & scene->lay)) {
if(scene == NULL) {
/* pass - unlikely but when running scripts on startup it happens */
}
else if((ob->lay & scene->lay) && (base->lay & scene->lay)) {
/* pass */
} else if((ob->lay & scene->lay)==0 && (base->lay & scene->lay)==0) {
}
else if((ob->lay & scene->lay)==0 && (base->lay & scene->lay)==0) {
/* pass */
} else {
}
else {
DAG_scene_sort(bmain, scene);
}
}
@@ -284,7 +289,7 @@ static void rna_Object_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr)
Object *ob= (Object*)ptr->id.data;
Base *base;
base= object_in_scene(ob, scene);
base= scene ? object_in_scene(ob, scene) : NULL;
if(!base)
return;

5
source/blender/windowmanager/intern/wm_files.c
View File

@@ -635,8 +635,9 @@ static ImBuf *blend_file_thumb(Scene *scene, int **thumb_pt)
char err_out[256]= "unknown";
*thumb_pt= NULL;
if(G.background || scene->camera==NULL)
/* scene can be NULL if running a script at startup and calling the save operator */
if(G.background || scene==NULL || scene->camera==NULL)
return NULL;
/* gets scaled to BLEN_THUMB_SIZE */