Revision: 17869
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17869
Author: blendix
Date: 2008-12-15 11:48:04 +0100 (Mon, 15 Dec 2008)
Log Message:
-----------
RNA:
* DNA_sequence_types.h done, patch by Roelf de Kock, with various changes,
mainly the use of inheritance for different sequence types and hiding the
separate Strip struct.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c
Modified:
branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
2008-12-15 08:37:39 UTC (rev 17868)
+++
branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
2008-12-15 10:48:04 UTC (rev 17869)
@@ -230,7 +230,8 @@
if(nameprop)
nameptr= RNA_property_string_get_alloc(&lookup,
nameprop, name, sizeof(name));
- else
+
+ if(!nameprop || strlen(nameptr) == 0)
sprintf(nameptr, "%d", cell->index+1);
}
Modified:
branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_sequence_types.h
2008-12-15 10:48:04 UTC (rev 17869)
@@ -182,9 +182,6 @@
ListBase *seqbasep;
ListBase seqbase;
ListBase metastack;
- short flag;
- short pad;
- int rt;
} Editing;
/* ************* Effect Variable Structs ********* */
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
2008-12-15 10:48:04 UTC (rev 17869)
@@ -62,10 +62,11 @@
PROP_NONE = 0,
PROP_UNSIGNED = 1,
PROP_FILEPATH = 2,
- PROP_COLOR = 3,
- PROP_VECTOR = 4,
- PROP_MATRIX = 5,
- PROP_ROTATION = 6
+ PROP_DIRPATH = 3,
+ PROP_COLOR = 4,
+ PROP_VECTOR = 5,
+ PROP_MATRIX = 6,
+ PROP_ROTATION = 7
} PropertySubType;
typedef enum PropertyFlag {
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2008-12-15 10:48:04 UTC (rev 17869)
@@ -638,6 +638,7 @@
case PROP_NONE: return "PROP_NONE";
case PROP_UNSIGNED: return "PROP_UNSIGNED";
case PROP_FILEPATH: return "PROP_FILEPATH";
+ case PROP_DIRPATH: return "PROP_DIRPATH";
case PROP_COLOR: return "PROP_COLOR";
case PROP_VECTOR: return "PROP_VECTOR";
case PROP_MATRIX: return "PROP_MATRIX";
@@ -921,6 +922,7 @@
{"rna_scene.c", RNA_def_scene},
{"rna_screen.c", RNA_def_screen},
{"rna_sensor.c", RNA_def_sensor},
+ {"rna_sequence.c", RNA_def_sequence},
{"rna_vfont.c", RNA_def_vfont},
{"rna_wm.c", RNA_def_wm},
{"rna_world.c", RNA_def_world},
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c
2008-12-15 10:48:04 UTC (rev 17869)
@@ -162,7 +162,7 @@
RNA_def_property_flag(prop, PROP_NOT_EDITABLE); /* must be unique */
RNA_def_property_ui_text(prop, "Name", "Unique datablock ID name.");
RNA_def_property_string_funcs(prop, "rna_ID_name_get",
"rna_ID_name_length", "rna_ID_name_set");
- RNA_def_property_string_maxlength(prop, 22);
+ RNA_def_property_string_maxlength(prop, sizeof(((ID*)NULL)->name)-2);
RNA_def_struct_name_property(srna, prop);
prop= RNA_def_property(srna, "users", PROP_INT, PROP_UNSIGNED);
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
2008-12-15 10:48:04 UTC (rev 17869)
@@ -145,7 +145,7 @@
prop= RNA_def_property(srna, "premultiply", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_DO_PREMUL);
- RNA_def_property_ui_text(prop, "Premultiply", "Convert from key alpha
to premultiplied alpha.");
+ RNA_def_property_ui_text(prop, "Premultiply", "Convert RGB from key
alpha to premultiplied alpha.");
/* generated image (image_generated_change_cb) */
prop= RNA_def_property(srna, "generated_type", PROP_ENUM, PROP_NONE);
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
2008-12-15 10:48:04 UTC (rev 17869)
@@ -123,6 +123,7 @@
void RNA_def_scene(struct BlenderRNA *brna);
void RNA_def_screen(struct BlenderRNA *brna);
void RNA_def_sensor(struct BlenderRNA *brna);
+void RNA_def_sequence(struct BlenderRNA *brna);
void RNA_def_vfont(struct BlenderRNA *brna);
void RNA_def_wm(struct BlenderRNA *brna);
void RNA_def_world(struct BlenderRNA *brna);
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
2008-12-15 08:37:39 UTC (rev 17868)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
2008-12-15 10:48:04 UTC (rev 17869)
@@ -143,6 +143,11 @@
prop= RNA_def_property(srna, "nodetree", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Node Tree", "Compositing node tree.");
+
+ prop= RNA_def_property(srna, "sequence_editor", PROP_POINTER,
PROP_NONE);
+ RNA_def_property_pointer_sdna(prop, NULL, "ed");
+ RNA_def_property_struct_type(prop, "SequenceEditor");
+ RNA_def_property_ui_text(prop, "Sequence Editor", "");
prop= RNA_def_property(srna, "radiosity", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "radio");
Added: branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c
(rev 0)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c
2008-12-15 10:48:04 UTC (rev 17869)
@@ -0,0 +1,865 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Contributor(s): Blender Foundation (2008)
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <limits.h>
+
+#include "RNA_define.h"
+#include "RNA_types.h"
+
+#include "rna_internal.h"
+
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_sequence_types.h"
+
+#ifdef RNA_RUNTIME
+
+/* name functions that ignore the first two characters */
+static void rna_Sequence_name_get(PointerRNA *ptr, char *value)
+{
+ Sequence *seq= (Sequence*)ptr->data;
+ BLI_strncpy(value, seq->name+2, sizeof(seq->name)-2);
+}
+
+static int rna_Sequence_name_length(PointerRNA *ptr)
+{
+ Sequence *seq= (Sequence*)ptr->data;
+ return strlen(seq->name+2);
+}
+
+static void rna_Sequence_name_set(PointerRNA *ptr, const char *value)
+{
+ Sequence *seq= (Sequence*)ptr->data;
+ BLI_strncpy(seq->name+2, value, sizeof(seq->name)-2);
+}
+
+static StructRNA* rna_Sequence_refine(struct PointerRNA *ptr)
+{
+ Sequence *seq= (Sequence*)ptr->data;
+
+ switch(seq->type) {
+ case SEQ_IMAGE:
+ return &RNA_ImageSequence;
+ case SEQ_META:
+ return &RNA_MetaSequence;
+ case SEQ_SCENE:
+ return &RNA_SceneSequence;
+ case SEQ_MOVIE:
+ case SEQ_MOVIE_AND_HD_SOUND:
+ return &RNA_MovieSequence;
+ case SEQ_RAM_SOUND:
+ case SEQ_HD_SOUND:
+ return &RNA_SoundSequence;
+ case SEQ_CROSS:
+ case SEQ_ADD:
+ case SEQ_SUB:
+ case SEQ_ALPHAOVER:
+ case SEQ_ALPHAUNDER:
+ case SEQ_GAMCROSS:
+ case SEQ_MUL:
+ case SEQ_OVERDROP:
+ return &RNA_EffectSequence;
+ case SEQ_PLUGIN:
+ return &RNA_PluginSequence;
+ case SEQ_WIPE:
+ return &RNA_WipeSequence;
+ case SEQ_GLOW:
+ return &RNA_GlowSequence;
+ case SEQ_TRANSFORM:
+ return &RNA_TransformSequence;
+ case SEQ_COLOR:
+ return &RNA_ColorSequence;
+ case SEQ_SPEED:
+ return &RNA_SpeedControlSequence;
+ default:
+ return &RNA_Sequence;
+ }
+}
+
+static void *rna_SequenceEdtior_meta_stack_get(CollectionPropertyIterator
*iter)
+{
+ ListBaseIterator *internal= iter->internal;
+ MetaStack *ms= (MetaStack*)internal->link;
+
+ return (Sequence*)ms->parseq;
+}
+
+#else
+
+static void rna_def_strip_element(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna = RNA_def_struct(brna, "SequenceElement", NULL, "Sequence
Element");
+ RNA_def_struct_sdna(srna, "StripElem");
+
+ prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
+ RNA_def_property_string_sdna(prop, NULL, "name");
+ RNA_def_property_ui_text(prop, "Filename", "");
+}
+
+static void rna_def_strip_crop(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna = RNA_def_struct(brna, "SequenceCrop", NULL, "Sequence Crop");
+ RNA_def_struct_sdna(srna, "StripCrop");
+
+ prop= RNA_def_property(srna, "top", PROP_INT, PROP_UNSIGNED);
+ RNA_def_property_ui_text(prop, "Top", "");
+ RNA_def_property_ui_range(prop, 0, 4096, 1, 0);
+
+ prop= RNA_def_property(srna, "bottom", PROP_INT, PROP_UNSIGNED);
+ RNA_def_property_ui_text(prop, "Bottom", "");
+ RNA_def_property_ui_range(prop, 0, 4096, 1, 0);
+
+ prop= RNA_def_property(srna, "left", PROP_INT, PROP_UNSIGNED);
+ RNA_def_property_ui_text(prop, "Left", "");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
