[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30115] trunk/blender/source/blender: - duplicating a scene now duplicates all strips (not just selected ones)

[Campbell Barton]

Revision: 30115
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30115
Author:   campbellbarton
Date:     2010-07-08 16:30:43 +0200 (Thu, 08 Jul 2010)

Log Message:
-----------
- duplicating a scene now duplicates all strips (not just selected ones)
- python change, dont import 'bpy' by default, initially I thaught this would make scripting easier but it ends up being annoying when you want to register a script or if you want to import it. (more trouble then its worth to save 1 line, also not very pythonic).

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_sequencer.h
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/python/intern/bpy_interface.c

Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2010-07-08 14:02:18 UTC (rev 30114)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2010-07-08 14:30:43 UTC (rev 30115)
@@ -234,6 +234,7 @@
 #define SEQ_DUPE_UNIQUE_NAME	1<<0
 #define SEQ_DUPE_CONTEXT		1<<1
 #define SEQ_DUPE_ANIM			1<<2
+#define SEQ_DUPE_ALL			1<<3 /* otherwise only selected are copied */
 
 /* use as an api function */
 typedef struct Sequence *(*SeqLoadFunc)(struct bContext *, ListBase *, struct SeqLoadInfo *);

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2010-07-08 14:02:18 UTC (rev 30114)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2010-07-08 14:30:43 UTC (rev 30115)
@@ -220,7 +220,7 @@
 		if(sce->ed) {
 			scen->ed= MEM_callocN( sizeof(Editing), "addseq");
 			scen->ed->seqbasep= &scen->ed->seqbase;
-			seqbase_dupli_recursive(sce, &scen->ed->seqbase, &sce->ed->seqbase, 0);
+			seqbase_dupli_recursive(sce, &scen->ed->seqbase, &sce->ed->seqbase, SEQ_DUPE_ALL);
 		}
 	}
 

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-07-08 14:02:18 UTC (rev 30114)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-07-08 14:30:43 UTC (rev 30115)
@@ -4299,7 +4299,7 @@
 
 	for(seq= seqbase->first; seq; seq= seq->next) {
 		seq->tmp= NULL;
-		if(seq->flag & SELECT) {
+		if((seq->flag & SELECT) || (dupe_flag & SEQ_DUPE_ALL)) {
 			seqn = seq_dupli(scene, seq, dupe_flag);
 			if (seqn) { /*should never fail */
 				if(dupe_flag & SEQ_DUPE_CONTEXT) {

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2010-07-08 14:02:18 UTC (rev 30114)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2010-07-08 14:30:43 UTC (rev 30115)
@@ -166,11 +166,6 @@
 		Py_DECREF(item);
 	}
 
-	/* add bpy to global namespace */
-	mod= PyImport_ImportModuleLevel("bpy", NULL, NULL, NULL, 0);
-	PyDict_SetItemString( dict, "bpy", mod );
-	Py_DECREF(mod);
-	
 	return dict;
 }