[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53509] trunk/blender: changes needed for EDL import to work again.
Campbell Barton
ideasman42 at gmail.com
Wed Jan 2 17:15:49 CET 2013
Revision: 53509
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53509
Author: campbellbarton
Date: 2013-01-02 16:15:45 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
changes needed for EDL import to work again.
- add sequence.update(data=False) function.
- made some sequence vars editable.
- correct some comments.
also rename rna function sequence.getStripElem() --> strip_elem_from_frame()
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy_extras/object_utils.py
trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
trunk/blender/source/blender/python/intern/bpy_interface.c
Modified: trunk/blender/release/scripts/modules/bpy_extras/object_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/object_utils.py 2013-01-02 16:10:03 UTC (rev 53508)
+++ trunk/blender/release/scripts/modules/bpy_extras/object_utils.py 2013-01-02 16:15:45 UTC (rev 53509)
@@ -26,7 +26,6 @@
import bpy
-import mathutils
from bpy.props import BoolProperty, FloatVectorProperty
@@ -80,7 +79,7 @@
rotation = space_data.region_3d.view_matrix.to_3x3().inverted()
rotation.resize_4x4()
else:
- rotation = mathutils.Matrix()
+ rotation = Matrix()
# set the operator properties
if operator:
Modified: trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py 2013-01-02 16:10:03 UTC (rev 53508)
+++ trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py 2013-01-02 16:15:45 UTC (rev 53509)
@@ -19,7 +19,6 @@
# <pep8-80 compliant>
import bpy
from bpy.types import Operator
-import mathutils
from bpy.props import (FloatProperty,
IntProperty,
@@ -31,10 +30,8 @@
def add_torus(major_rad, minor_rad, major_seg, minor_seg):
from math import cos, sin, pi
+ from mathutils import Vector, Quaternion
- Vector = mathutils.Vector
- Quaternion = mathutils.Quaternion
-
PI_2 = pi * 2.0
z_axis = 0.0, 0.0, 1.0
Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2013-01-02 16:10:03 UTC (rev 53508)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2013-01-02 16:15:45 UTC (rev 53509)
@@ -433,7 +433,7 @@
elem = False
if strip.type == 'IMAGE':
- elem = strip.getStripElem(frame_current)
+ elem = strip.strip_elem_from_frame(frame_current)
elif strip.type == 'MOVIE':
elem = strip.elements[0]
@@ -595,7 +595,7 @@
# Current element for the filename
- elem = strip.getStripElem(context.scene.frame_current)
+ elem = strip.strip_elem_from_frame(context.scene.frame_current)
if elem:
split = layout.split(percentage=0.2)
split.label(text="File:")
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-01-02 16:10:03 UTC (rev 53508)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-01-02 16:15:45 UTC (rev 53509)
@@ -633,7 +633,7 @@
}
}
-/* note: caller should run calc_sequence(scene, seq) after */
+/* note: caller should run BKE_sequence_calc(scene, seq) after */
void BKE_sequence_reload_new_file(Scene *scene, Sequence *seq, int lock_range)
{
char str[FILE_MAX];
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c 2013-01-02 16:10:03 UTC (rev 53508)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c 2013-01-02 16:15:45 UTC (rev 53509)
@@ -871,7 +871,7 @@
if (BKE_sequence_test_overlap(ed->seqbasep, seq)) BKE_sequence_base_shuffle(ed->seqbasep, seq, scene);
}
- BKE_sequencer_update_changed_seq_and_deps(scene, seq, 1, 1); /* runs calc_sequence */
+ BKE_sequencer_update_changed_seq_and_deps(scene, seq, 1, 1); /* runs BKE_sequence_calc */
/* not sure if this is needed with update_changed_seq_and_deps.
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-01-02 16:10:03 UTC (rev 53508)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-01-02 16:15:45 UTC (rev 53509)
@@ -4090,7 +4090,7 @@
/* Meta's can only directly be moved between channels since they
* don't have their start and length set directly (children affect that)
* since this Meta is nested we don't need any of its data in fact.
- * calc_sequence() will update its settings when run on the toplevel meta */
+ * BKE_sequence_calc() will update its settings when run on the toplevel meta */
*flag = 0;
*count = 0;
*recursive = TRUE;
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c 2013-01-02 16:10:03 UTC (rev 53508)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c 2013-01-02 16:15:45 UTC (rev 53509)
@@ -1401,26 +1401,26 @@
prop = RNA_def_property(srna, "frame_offset_start", PROP_INT, PROP_TIME);
RNA_def_property_int_sdna(prop, NULL, "startofs");
- RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* overlap tests */
+// RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* overlap tests */
RNA_def_property_ui_text(prop, "Start Offset", "");
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update");
prop = RNA_def_property(srna, "frame_offset_end", PROP_INT, PROP_TIME);
RNA_def_property_int_sdna(prop, NULL, "endofs");
- RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* overlap tests */
+// RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* overlap tests */
RNA_def_property_ui_text(prop, "End Offset", "");
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update");
prop = RNA_def_property(srna, "frame_still_start", PROP_INT, PROP_TIME);
RNA_def_property_int_sdna(prop, NULL, "startstill");
- RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* overlap tests */
+// RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* overlap tests */
RNA_def_property_range(prop, 0, MAXFRAME);
RNA_def_property_ui_text(prop, "Start Still", "");
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update");
prop = RNA_def_property(srna, "frame_still_end", PROP_INT, PROP_TIME);
RNA_def_property_int_sdna(prop, NULL, "endstill");
- RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* overlap tests */
+// RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* overlap tests */
RNA_def_property_range(prop, 0, MAXFRAME);
RNA_def_property_ui_text(prop, "End Still", "");
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update");
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c 2013-01-02 16:10:03 UTC (rev 53508)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c 2013-01-02 16:15:45 UTC (rev 53509)
@@ -37,6 +37,8 @@
#include "DNA_scene_types.h"
#include "DNA_sequence_types.h"
+#include "BLI_utildefines.h"
+
#ifdef RNA_RUNTIME
//#include "DNA_anim_types.h"
@@ -62,6 +64,16 @@
#include "WM_api.h"
+static void rna_Sequence_update_rnafunc(ID *id, Sequence *self, int do_data)
+{
+ if (do_data) {
+ BKE_sequencer_update_changed_seq_and_deps((Scene *)id, self, true, true);
+ // new_tstripdata(self); // need 2.6x version of this.
+ }
+ BKE_sequence_calc((Scene *)id, self);
+ BKE_sequence_calc_disp((Scene *)id, self);
+}
+
static void rna_Sequence_swap_internal(Sequence *seq_self, ReportList *reports, Sequence *seq_other)
{
const char *error_msg;
@@ -389,7 +401,13 @@
FunctionRNA *func;
PropertyRNA *parm;
- func = RNA_def_function(srna, "getStripElem", "BKE_sequencer_give_stripelem");
+ func = RNA_def_function(srna, "update", "rna_Sequence_update_rnafunc");
+ RNA_def_function_flag(func, FUNC_USE_SELF_ID);
+ RNA_def_function_ui_description(func, "Update the strip dimensions");
+ parm = RNA_def_boolean(func, "data", false, "Frame",
+ "Update strip data");
+
+ func = RNA_def_function(srna, "strip_elem_from_frame", "BKE_sequencer_give_stripelem");
RNA_def_function_ui_description(func, "Return the strip element from a given frame or None");
parm = RNA_def_int(func, "frame", 0, -MAXFRAME, MAXFRAME, "Frame",
"The frame to get the strip element from", -MAXFRAME, MAXFRAME);
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2013-01-02 16:10:03 UTC (rev 53508)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2013-01-02 16:15:45 UTC (rev 53509)
@@ -818,7 +818,7 @@
} dealloc_obj;
/* call once __file__ is set */
-void bpy_module_delay_init(PyObject *bpy_proxy)
+static void bpy_module_delay_init(PyObject *bpy_proxy)
{
const int argc = 1;
const char *argv[2];
@@ -857,6 +857,9 @@
}
PyMODINIT_FUNC
+PyInit_bpy(void);
+
+PyMODINIT_FUNC
PyInit_bpy(void)
{
PyObject *bpy_proxy = PyModule_Create(&bpy_proxy_def);
More information about the Bf-blender-cvs
mailing list