[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21022] branches/soc-2009-aligorith/source /blender: NLA SoC: Fixes for problems arising from the merge

[Joshua Leung]

Revision: 21022
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21022
Author:   aligorith
Date:     2009-06-20 05:58:25 +0200 (Sat, 20 Jun 2009)

Log Message:
-----------
NLA SoC: Fixes for problems arising from the merge

Modified Paths:
--------------
    branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_select.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nla.c

Modified: branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_buttons.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_buttons.c	2009-06-20 03:38:34 UTC (rev 21021)
+++ branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_buttons.c	2009-06-20 03:58:25 UTC (rev 21022)
@@ -206,11 +206,7 @@
 	uiLayout *layout= pa->layout;
 	uiLayout *column, *row, *subcol;
 	uiBlock *block;
-
-	/* check context and also validity of pointer */
-	if (!nla_panel_context(C, NULL, &strip_ptr))
-		return;
-
+	
 	block= uiLayoutGetBlock(layout);
 	uiBlockSetHandleFunc(block, do_nla_region_buttons, NULL);
 	

Modified: branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_select.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_select.c	2009-06-20 03:38:34 UTC (rev 21021)
+++ branches/soc-2009-aligorith/source/blender/editors/space_nla/nla_select.c	2009-06-20 03:58:25 UTC (rev 21022)
@@ -361,10 +361,10 @@
 
 /* defines for left-right select tool */
 static EnumPropertyItem prop_nlaedit_leftright_select_types[] = {
-	{NLAEDIT_LRSEL_TEST, "CHECK", "Check if Select Left or Right", ""},
-	{NLAEDIT_LRSEL_NONE, "OFF", "Don't select", ""},
-	{NLAEDIT_LRSEL_LEFT, "LEFT", "Before current frame", ""},
-	{NLAEDIT_LRSEL_RIGHT, "RIGHT", "After current frame", ""},
+	{NLAEDIT_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""},
+	{NLAEDIT_LRSEL_NONE, "OFF", 0, "Don't select", ""},
+	{NLAEDIT_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""},
+	{NLAEDIT_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""},
 	{0, NULL, NULL, NULL}
 };
 

Modified: branches/soc-2009-aligorith/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/makesrna/intern/makesrna.c	2009-06-20 03:38:34 UTC (rev 21021)
+++ branches/soc-2009-aligorith/source/blender/makesrna/intern/makesrna.c	2009-06-20 03:58:25 UTC (rev 21022)
@@ -1846,7 +1846,7 @@
 	{"rna_mesh.c", "rna_mesh_api.c", RNA_def_mesh},
 	{"rna_meta.c", NULL, RNA_def_meta},
 	{"rna_modifier.c", NULL, RNA_def_modifier},
-	{"rna_nla.c", RNA_def_nla},
+	{"rna_nla.c", NULL, RNA_def_nla},
 	{"rna_nodetree.c", NULL, RNA_def_nodetree},
 	{"rna_object.c", "rna_object_api.c", RNA_def_object},
 	{"rna_object_force.c", NULL, RNA_def_object_force},

Modified: branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nla.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nla.c	2009-06-20 03:38:34 UTC (rev 21021)
+++ branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nla.c	2009-06-20 03:58:25 UTC (rev 21022)
@@ -157,20 +157,20 @@
 	
 		/* enum defs */
 	static EnumPropertyItem prop_type_items[] = {
-		{NLASTRIP_TYPE_CLIP, "CLIP", "Action Clip", "NLA Strip references some Action."},
-		{NLASTRIP_TYPE_TRANSITION, "TRANSITION", "Transition", "NLA Strip 'transitions' between adjacent strips."},
-		{0, NULL, NULL, NULL}};
+		{NLASTRIP_TYPE_CLIP, "CLIP", 0, "Action Clip", "NLA Strip references some Action."},
+		{NLASTRIP_TYPE_TRANSITION, "TRANSITION", 0, "Transition", "NLA Strip 'transitions' between adjacent strips."},
+		{0, NULL, 0, NULL, NULL}};
 	static EnumPropertyItem prop_mode_blend_items[] = {
-		{NLASTRIP_MODE_BLEND, "BLEND", "Blend", "Results of strip and accumulated results are combined in ratio governed by influence."},
-		{NLASTRIP_MODE_ADD, "ADD", "Add", "Weighted result of strip is added to the accumlated results."},
-		{NLASTRIP_MODE_SUBTRACT, "SUBTRACT", "Subtract", "Weighted result of strip is removed from the accumlated results."},
-		{NLASTRIP_MODE_MULTIPLY, "MULITPLY", "Multiply", "Weighted result of strip is multiplied with the accumlated results."},
-		{0, NULL, NULL, NULL}};
+		{NLASTRIP_MODE_BLEND, "BLEND", 0, "Blend", "Results of strip and accumulated results are combined in ratio governed by influence."},
+		{NLASTRIP_MODE_ADD, "ADD", 0, "Add", "Weighted result of strip is added to the accumlated results."},
+		{NLASTRIP_MODE_SUBTRACT, "SUBTRACT", 0, "Subtract", "Weighted result of strip is removed from the accumlated results."},
+		{NLASTRIP_MODE_MULTIPLY, "MULITPLY", 0, "Multiply", "Weighted result of strip is multiplied with the accumlated results."},
+		{0, NULL, 0, NULL, NULL}};
 	static EnumPropertyItem prop_mode_extend_items[] = {
-		{NLASTRIP_EXTEND_NOTHING, "NOTHING", "Nothing", "Strip has no influence past its extents."},
-		{NLASTRIP_EXTEND_HOLD, "HOLD", "Hold", "Hold the first frame if no previous strips in track, and always hold last frame."},
-		{NLASTRIP_EXTEND_HOLD_FORWARD, "HOLD_FORWARD", "Hold Forward", "Only hold last frame."},
-		{0, NULL, NULL, NULL}};
+		{NLASTRIP_EXTEND_NOTHING, "NOTHING", 0, "Nothing", "Strip has no influence past its extents."},
+		{NLASTRIP_EXTEND_HOLD, "HOLD", 0, "Hold", "Hold the first frame if no previous strips in track, and always hold last frame."},
+		{NLASTRIP_EXTEND_HOLD_FORWARD, "HOLD_FORWARD", 0, "Hold Forward", "Only hold last frame."},
+		{0, NULL, 0, NULL, NULL}};
 	
 	/* struct definition */
 	srna= RNA_def_struct(brna, "NlaStrip", NULL);