[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40122] trunk/blender/source/blender: move maxseq define into DNA.
Campbell Barton
ideasman42 at gmail.com
Sun Sep 11 12:35:26 CEST 2011
Revision: 40122
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40122
Author: campbellbarton
Date: 2011-09-11 10:35:26 +0000 (Sun, 11 Sep 2011)
Log Message:
-----------
move maxseq define into DNA.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2011-09-11 10:30:43 UTC (rev 40121)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2011-09-11 10:35:26 UTC (rev 40122)
@@ -45,8 +45,6 @@
struct StripElem;
struct bSound;
-#define MAXSEQ 32
-
#define BUILD_SEQAR_COUNT_NOTHING 0
#define BUILD_SEQAR_COUNT_CURRENT 1
#define BUILD_SEQAR_COUNT_CHILDREN 2
Modified: trunk/blender/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2011-09-11 10:30:43 UTC (rev 40121)
+++ trunk/blender/source/blender/makesdna/DNA_sequence_types.h 2011-09-11 10:35:26 UTC (rev 40122)
@@ -238,6 +238,8 @@
int lastValidFrame;
} SpeedControlVars;
+#define MAXSEQ 32
+
#define SELECT 1
/* Editor->over_flag */
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-09-11 10:30:43 UTC (rev 40121)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-09-11 10:35:26 UTC (rev 40122)
@@ -43,6 +43,7 @@
#include "DNA_node_types.h"
#include "DNA_object_types.h"
#include "DNA_space_types.h"
+#include "DNA_sequence_types.h"
#include "DNA_view3d_types.h"
#include "WM_api.h"
@@ -1758,7 +1759,7 @@
prop= RNA_def_property(srna, "display_channel", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "chanshown");
RNA_def_property_ui_text(prop, "Display Channel", "The channel number shown in the image preview. 0 is the result of all strips combined");
- RNA_def_property_range(prop, -5, 32); // MAXSEQ --- todo, move from BKE_sequencer.h, allow up to 5 layers up the metastack. Should be dynamic...
+ RNA_def_property_range(prop, -5, MAXSEQ);
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
prop= RNA_def_property(srna, "draw_overexposed", PROP_INT, PROP_NONE);
More information about the Bf-blender-cvs
mailing list