[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50040] branches/soc-2011-tomato: Merging r50037 through r50039 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Aug 20 12:57:51 CEST 2012
Revision: 50040
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50040
Author: nazgul
Date: 2012-08-20 10:57:51 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Merging r50037 through r50039 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50037
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50039
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50036
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50039
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h 2012-08-20 10:56:19 UTC (rev 50039)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h 2012-08-20 10:57:51 UTC (rev 50040)
@@ -384,7 +384,9 @@
struct SequenceModifierTypeInfo *BKE_sequence_modifier_type_info_get(int type);
-void BKE_sequence_modifier_new(struct Sequence *seq, int type);
+struct SequenceModifierData *BKE_sequence_modifier_new(struct Sequence *seq, const char *name, int type);
+int BKE_sequence_modifier_remove(struct Sequence *seq, struct SequenceModifierData *smd);
+void BKE_sequence_modifier_clear(struct Sequence *seq);
void BKE_sequence_modifier_free(struct SequenceModifierData *smd);
void BKE_sequence_modifier_unique_name(struct Sequence *seq, struct SequenceModifierData *smd);
struct SequenceModifierData *BKE_sequence_modifier_find_by_name(struct Sequence *seq, char *name);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c 2012-08-20 10:56:19 UTC (rev 50039)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c 2012-08-20 10:57:51 UTC (rev 50040)
@@ -417,7 +417,7 @@
return modifiersTypes[type];
}
-void BKE_sequence_modifier_new(Sequence *seq, int type)
+SequenceModifierData *BKE_sequence_modifier_new(Sequence *seq, const char *name, int type)
{
SequenceModifierData *smd;
SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(type);
@@ -427,7 +427,10 @@
smd->type = type;
smd->flag |= SEQUENCE_MODIFIER_EXPANDED;
- BLI_strncpy(smd->name, smti->name, sizeof(smd->name));
+ if (!name || !name[0])
+ BLI_strncpy(smd->name, smti->name, sizeof(smd->name));
+ else
+ BLI_strncpy(smd->name, name, sizeof(smd->name));
BLI_addtail(&seq->modifiers, smd);
@@ -435,8 +438,33 @@
if (smti->init_data)
smti->init_data(smd);
+
+ return smd;
}
+int BKE_sequence_modifier_remove(Sequence *seq, SequenceModifierData *smd)
+{
+ if (BLI_findindex(&seq->modifiers, smd) == -1)
+ return FALSE;
+
+ BLI_remlink(&seq->modifiers, smd);
+ BKE_sequence_modifier_free(smd);
+
+ return TRUE;
+}
+
+void BKE_sequence_modifier_clear(Sequence *seq)
+{
+ SequenceModifierData *smd, *smd_next;
+
+ for (smd = seq->modifiers.first; smd; smd = smd_next) {
+ smd_next = smd->next;
+ BKE_sequence_modifier_free(smd);
+ }
+
+ seq->modifiers.first = seq->modifiers.last = NULL;
+}
+
void BKE_sequence_modifier_free(SequenceModifierData *smd)
{
SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(smd->type);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c 2012-08-20 10:56:19 UTC (rev 50039)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c 2012-08-20 10:57:51 UTC (rev 50040)
@@ -205,15 +205,8 @@
}
/* free modifiers */
- if (seq->modifiers.first) {
- SequenceModifierData *smd, *smd_next;
+ BKE_sequence_modifier_clear(seq);
- for (smd = seq->modifiers.first; smd; smd = smd_next) {
- smd_next = smd->next;
- BKE_sequence_modifier_free(smd);
- }
- }
-
BKE_sequencer_cache_cleanup_sequence(seq);
BKE_sequencer_preprocessed_cache_cleanup_sequence(seq);
@@ -2574,7 +2567,8 @@
ibuf = do_render_strip_uncached(context, seq, cfra);
- BKE_sequencer_preprocessed_cache_put(context, seq, cfra, SEQ_STRIPELEM_IBUF, ibuf);
+ if (ibuf)
+ BKE_sequencer_preprocessed_cache_put(context, seq, cfra, SEQ_STRIPELEM_IBUF, ibuf);
}
}
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50036
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50039
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50036
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50039
Modified: branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_modifier.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_modifier.c 2012-08-20 10:56:19 UTC (rev 50039)
+++ branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_modifier.c 2012-08-20 10:57:51 UTC (rev 50040)
@@ -84,7 +84,7 @@
Sequence *seq = BKE_sequencer_active_get(scene);
int type = RNA_enum_get(op->ptr, "type");
- BKE_sequence_modifier_new(seq, type);
+ BKE_sequence_modifier_new(seq, NULL, type);
BKE_sequence_invalidate_cache(scene, seq);
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
@@ -96,14 +96,6 @@
{
PropertyRNA *prop;
- /* TODO: de-duplicate from RNA */
- static EnumPropertyItem sequence_modifier_type_items[] = {
- {seqModifierType_ColorBalance, "COLOR_BALANCE", ICON_NONE, "Color Balance", ""},
- {seqModifierType_Curves, "CURVES", ICON_NONE, "Curves", ""},
- {seqModifierType_HueCorrect,"HUE_CORRECT", ICON_NONE, "Hue Correct", ""},
- {0, NULL, 0, NULL, NULL}
- };
-
/* identifiers */
ot->name = "Add Strip Modifier";
ot->idname = "SEQUENCER_OT_strip_modifier_add";
Modified: branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h 2012-08-20 10:56:19 UTC (rev 50039)
+++ branches/soc-2011-tomato/source/blender/makesrna/RNA_enum_types.h 2012-08-20 10:57:51 UTC (rev 50040)
@@ -52,6 +52,7 @@
extern EnumPropertyItem modifier_type_items[];
extern EnumPropertyItem constraint_type_items[];
extern EnumPropertyItem boidrule_type_items[];
+extern EnumPropertyItem sequence_modifier_type_items[];
extern EnumPropertyItem image_type_items[];
extern EnumPropertyItem image_color_mode_items[];
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c 2012-08-20 10:56:19 UTC (rev 50039)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c 2012-08-20 10:57:51 UTC (rev 50040)
@@ -1768,7 +1768,7 @@
func = RNA_def_function(srna, "new", "rna_Object_modifier_new");
RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
RNA_def_function_ui_description(func, "Add a new modifier");
- parm = RNA_def_string(func, "name", "Name", 0, "", "New name for the bone");
+ parm = RNA_def_string(func, "name", "Name", 0, "", "New name for the modifier");
RNA_def_property_flag(parm, PROP_REQUIRED);
/* modifier to add */
parm = RNA_def_enum(func, "type", modifier_type_items, 1, "", "Modifier type to add");
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c 2012-08-20 10:56:19 UTC (rev 50039)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c 2012-08-20 10:57:51 UTC (rev 50040)
@@ -30,6 +30,7 @@
#include "RNA_access.h"
#include "RNA_define.h"
+#include "RNA_enum_types.h"
#include "rna_internal.h"
@@ -58,8 +59,20 @@
int supports_mask;
} EffectInfo;
+EnumPropertyItem sequence_modifier_type_items[] = {
+ {seqModifierType_ColorBalance, "COLOR_BALANCE", ICON_NONE, "Color Balance", ""},
+ {seqModifierType_Curves, "CURVES", ICON_NONE, "Curves", ""},
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list