Revision: 30117
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30117
Author: blendix
Date: 2010-07-08 17:14:32 +0200 (Thu, 08 Jul 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30108:30116
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/BKE_sequencer.h
branches/render25/source/blender/blenkernel/intern/scene.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/editors/space_sequencer/sequencer_ops.c
branches/render25/source/blender/python/intern/bpy_interface.c
branches/render25/source/blender/render/intern/source/convertblender.c
Modified: branches/render25/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_sequencer.h 2010-07-08
15:07:35 UTC (rev 30116)
+++ branches/render25/source/blender/blenkernel/BKE_sequencer.h 2010-07-08
15:14:32 UTC (rev 30117)
@@ -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: branches/render25/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/scene.c 2010-07-08
15:07:35 UTC (rev 30116)
+++ branches/render25/source/blender/blenkernel/intern/scene.c 2010-07-08
15:14:32 UTC (rev 30117)
@@ -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: branches/render25/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/sequencer.c
2010-07-08 15:07:35 UTC (rev 30116)
+++ branches/render25/source/blender/blenkernel/intern/sequencer.c
2010-07-08 15:14:32 UTC (rev 30117)
@@ -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:
branches/render25/source/blender/editors/space_sequencer/sequencer_ops.c
===================================================================
--- branches/render25/source/blender/editors/space_sequencer/sequencer_ops.c
2010-07-08 15:07:35 UTC (rev 30116)
+++ branches/render25/source/blender/editors/space_sequencer/sequencer_ops.c
2010-07-08 15:14:32 UTC (rev 30117)
@@ -114,6 +114,9 @@
wmKeyMap *keymap= WM_keymap_find(keyconf, "SequencerCommon", SPACE_SEQ,
0);
wmKeyMapItem *kmi;
+ kmi= WM_keymap_add_item(keymap, "WM_OT_context_toggle", OKEY, KM_PRESS,
KM_SHIFT, 0);
+ RNA_string_set(kmi->ptr, "data_path",
"scene.sequence_editor.show_overlay");
+
/* operators common to sequence and preview view */
WM_keymap_add_item(keymap, "SEQUENCER_OT_view_toggle", TABKEY,
KM_PRESS, KM_CTRL, 0);
Modified: branches/render25/source/blender/python/intern/bpy_interface.c
===================================================================
--- branches/render25/source/blender/python/intern/bpy_interface.c
2010-07-08 15:07:35 UTC (rev 30116)
+++ branches/render25/source/blender/python/intern/bpy_interface.c
2010-07-08 15:14:32 UTC (rev 30117)
@@ -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;
}
Modified: branches/render25/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/render25/source/blender/render/intern/source/convertblender.c
2010-07-08 15:07:35 UTC (rev 30116)
+++ branches/render25/source/blender/render/intern/source/convertblender.c
2010-07-08 15:14:32 UTC (rev 30117)
@@ -745,7 +745,7 @@
/* create list of duplis generated by this
object, particle
* system need to have render settings set for
dupli particles */
dupli_render_particle_set(re, ob, timeoffset,
0, 1);
- lb= object_duplilist(sce, ob);
+ lb= object_duplilist(re->db.scene, ob);
dupli_render_particle_set(re, ob, timeoffset,
0, 0);
for(dob= lb->first; dob; dob= dob->next) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
