diff options
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 1727edc10fc..096c04b7bd3 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -60,7 +60,7 @@ #include "BKE_action.h" #include "BKE_anim.h" #include "BKE_armature.h" -#include "BKE_bad_level_calls.h" +#include "BKE_colortools.h" #include "BKE_colortools.h" #include "BKE_constraint.h" #include "BKE_depsgraph.h" @@ -79,8 +79,8 @@ #include "BKE_world.h" #include "BKE_utildefines.h" -#include "BIF_previewrender.h" -#include "BIF_editseq.h" +//XXX #include "BIF_previewrender.h" +//XXX #include "BIF_editseq.h" #ifndef DISABLE_PYTHON #include "BPY_extern.h" @@ -89,7 +89,7 @@ #include "BLI_arithb.h" #include "BLI_blenlib.h" -#include "nla.h" +//XXX #include "nla.h" #ifdef WIN32 #else @@ -138,7 +138,7 @@ void free_scene(Scene *sce) /* do not free objects! */ BLI_freelistN(&sce->base); - free_editing(sce->ed); + //XXX free_editing(sce->ed); if(sce->radio) MEM_freeN(sce->radio); sce->radio= 0; @@ -325,7 +325,7 @@ void set_scene_bg(Scene *sce) int flag; // Note: this here is defined in editseq.c (BIF_editseq.h), NOT in blenkernel! - clear_last_seq(); + //XXX clear_last_seq(); G.scene= sce; @@ -387,7 +387,7 @@ void set_scene_name(char *name) } } - error("Can't find scene: %s", name); + //XXX error("Can't find scene: %s", name); } /* used by metaballs |