[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15753] branches/blender-2.47/source/ blender: branches/blender-2.47

Diego Borghetti bdiego at gmail.com
Fri Jul 25 05:34:17 CEST 2008


Revision: 15753
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15753
Author:   bdiego
Date:     2008-07-25 05:34:05 +0200 (Fri, 25 Jul 2008)

Log Message:
-----------
branches/blender-2.47

Merge from trunk:
	Revision: 15704
	Revision: 15707
	Revision: 15726
	Revision: 15748
	Revision: 15751

Modified Paths:
--------------
    branches/blender-2.47/source/blender/blenkernel/intern/scene.c
    branches/blender-2.47/source/blender/makesdna/DNA_sequence_types.h
    branches/blender-2.47/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/blender-2.47/source/blender/nodes/intern/SHD_util.c
    branches/blender-2.47/source/blender/nodes/intern/SHD_util.h
    branches/blender-2.47/source/blender/python/api2_2x/doc/Ipo.py
    branches/blender-2.47/source/blender/src/buttons_editing.c
    branches/blender-2.47/source/blender/src/editseq.c

Modified: branches/blender-2.47/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/blender-2.47/source/blender/blenkernel/intern/scene.c	2008-07-25 03:13:16 UTC (rev 15752)
+++ branches/blender-2.47/source/blender/blenkernel/intern/scene.c	2008-07-25 03:34:05 UTC (rev 15753)
@@ -303,7 +303,7 @@
 	int flag;
 	
 	// Note: this here is defined in editseq.c (BIF_editseq.h), NOT in blenkernel! 
-	set_last_seq(NULL);
+	clear_last_seq();
 	
 	G.scene= sce;
 	

Modified: branches/blender-2.47/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- branches/blender-2.47/source/blender/makesdna/DNA_sequence_types.h	2008-07-25 03:13:16 UTC (rev 15752)
+++ branches/blender-2.47/source/blender/makesdna/DNA_sequence_types.h	2008-07-25 03:34:05 UTC (rev 15753)
@@ -257,6 +257,7 @@
 #define SEQ_USE_CROP                           131072
 #define SEQ_USE_COLOR_BALANCE                  262144
 #define SEQ_USE_PROXY_CUSTOM_DIR               524288
+#define SEQ_ACTIVE                            1048576
 
 #define SEQ_COLOR_BALANCE_INVERSE_GAIN 1
 #define SEQ_COLOR_BALANCE_INVERSE_GAMMA 2

Modified: branches/blender-2.47/source/blender/nodes/intern/SHD_nodes/SHD_material.c
===================================================================
--- branches/blender-2.47/source/blender/nodes/intern/SHD_nodes/SHD_material.c	2008-07-25 03:13:16 UTC (rev 15752)
+++ branches/blender-2.47/source/blender/nodes/intern/SHD_nodes/SHD_material.c	2008-07-25 03:34:05 UTC (rev 15753)
@@ -54,7 +54,6 @@
 	{	SOCK_VALUE, 1, "Refl",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	SOCK_VECTOR, 1, "Normal",	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f},
 	{	SOCK_RGBA, 1, "Mirror",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, "AmbCol",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	SOCK_VALUE, 1, "Ambient",	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	SOCK_VALUE, 1, "Emit",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	SOCK_VALUE, 1, "SpecTra",	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
@@ -117,8 +116,6 @@
 		if (node->type == SH_NODE_MATERIAL_EXT) {
 			if(in[MAT_IN_MIR]->hasinput)
 				nodestack_get_vec(&shi->mirr, SOCK_VECTOR, in[MAT_IN_MIR]);
-			if(in[MAT_IN_AMBCOL]->hasinput)
-				nodestack_get_vec(&shi->ambr, SOCK_VECTOR, in[MAT_IN_AMBCOL]);
 			if(in[MAT_IN_AMB]->hasinput)
 				nodestack_get_vec(&shi->amb, SOCK_VALUE, in[MAT_IN_AMB]);
 			if(in[MAT_IN_EMIT]->hasinput)

Modified: branches/blender-2.47/source/blender/nodes/intern/SHD_util.c
===================================================================
--- branches/blender-2.47/source/blender/nodes/intern/SHD_util.c	2008-07-25 03:13:16 UTC (rev 15752)
+++ branches/blender-2.47/source/blender/nodes/intern/SHD_util.c	2008-07-25 03:34:05 UTC (rev 15753)
@@ -164,7 +164,7 @@
 						case MAT_IN_MIR:
 							VECCOPY(&ma->mirr, sock->ns.vec); break;
 						case MAT_IN_AMB:
-							VECCOPY(&ma->ambr, sock->ns.vec); break;
+							ma->amb= sock->ns.vec[0]; break;
 						case MAT_IN_EMIT:
 							ma->emit= sock->ns.vec[0]; break;
 						case MAT_IN_SPECTRA:
@@ -188,7 +188,7 @@
 						case MAT_IN_MIR:
 							VECCOPY(sock->ns.vec, &ma->mirr); break;
 						case MAT_IN_AMB:
-							VECCOPY(sock->ns.vec, &ma->ambr); break;
+							sock->ns.vec[0]= ma->amb; break;
 						case MAT_IN_EMIT:
 							sock->ns.vec[0]= ma->emit; break;
 						case MAT_IN_SPECTRA:

Modified: branches/blender-2.47/source/blender/nodes/intern/SHD_util.h
===================================================================
--- branches/blender-2.47/source/blender/nodes/intern/SHD_util.h	2008-07-25 03:13:16 UTC (rev 15752)
+++ branches/blender-2.47/source/blender/nodes/intern/SHD_util.h	2008-07-25 03:34:05 UTC (rev 15753)
@@ -117,13 +117,12 @@
 #define MAT_IN_REFL		2
 #define MAT_IN_NORMAL	3
 #define MAT_IN_MIR		4
-#define MAT_IN_AMBCOL	5
-#define MAT_IN_AMB		6
-#define MAT_IN_EMIT	7
-#define MAT_IN_SPECTRA	8
-#define MAT_IN_RAY_MIRROR	9
-#define MAT_IN_ALPHA	10
-#define MAT_IN_TRANSLUCENCY	11
+#define MAT_IN_AMB		5
+#define MAT_IN_EMIT	6
+#define MAT_IN_SPECTRA	7
+#define MAT_IN_RAY_MIRROR	8
+#define MAT_IN_ALPHA	9
+#define MAT_IN_TRANSLUCENCY	10
 
 /* output socket defines */
 #define MAT_OUT_COLOR		0

Modified: branches/blender-2.47/source/blender/python/api2_2x/doc/Ipo.py
===================================================================
--- branches/blender-2.47/source/blender/python/api2_2x/doc/Ipo.py	2008-07-25 03:13:16 UTC (rev 15752)
+++ branches/blender-2.47/source/blender/python/api2_2x/doc/Ipo.py	2008-07-25 03:34:05 UTC (rev 15753)
@@ -250,7 +250,7 @@
 			OfsZ, SizeX, SizeY, SizeZ, texR, texG, texB, DefVar, Col, Nor, Var,
 			Disp.
 			3. Object Ipo: LocX, LocY, LocZ, dLocX, dLocY, dLocZ, RotX, RotY, RotZ,
-			dRotX, dRotY, dRotZ, SizeX, SizeY, SizeZ, dSizeX, dSizeY, dSizeZ,
+			dRotX, dRotY, dRotZ, ScaleX, ScaleY, ScaleZ, dScaleX, dScaleY, dScaleZ,
 			Layer, Time, ColR, ColG, ColB, ColA, FStreng, FFall, Damping,
 			RDamp, Perm.
 			4. Lamp Ipo: Energ, R, G, B, Dist, SpoSi, SpoBl, Quad1, Quad2, HaInt.
@@ -289,7 +289,7 @@
 			OfsZ, SizeX, SizeY, SizeZ, texR, texG, texB, DefVar, Col, Nor, Var,
 			Disp.
 			3. Object Ipo: LocX, LocY, LocZ, dLocX, dLocY, dLocZ, RotX, RotY, RotZ,
-			dRotX, dRotY, dRotZ, SizeX, SizeY, SizeZ, dSizeX, dSizeY, dSizeZ,
+			dRotX, dRotY, dRotZ, ScaleX, ScaleY, ScaleZ, dScaleX, dScaleY, dScaleZ,
 			Layer, Time, ColR, ColG, ColB, ColA, FStreng, FFall, Damping,
 			RDamp, Perm.
 			4. Lamp Ipo: Energ, R, G, B, Dist, SpoSi, SpoBl, Quad1, Quad2, HaInt.

Modified: branches/blender-2.47/source/blender/src/buttons_editing.c
===================================================================
--- branches/blender-2.47/source/blender/src/buttons_editing.c	2008-07-25 03:13:16 UTC (rev 15752)
+++ branches/blender-2.47/source/blender/src/buttons_editing.c	2008-07-25 03:34:05 UTC (rev 15753)
@@ -1928,7 +1928,7 @@
 			uiBlockBeginAlign(block);
 			uiDefButF(block, NUM, B_MODIFIER_RECALC, "Width: ",
 					  lx, (cy -= 19), buttonWidth, 19, &bmd->value,
-					  0.0, 0.5, 5, 2,
+					  0.0, 0.5, 5, 4,
 					  "Bevel value/amount");
 			/*uiDefButI(block, NUM, B_MODIFIER_RECALC, "Recurs",
 					  lx, (cy -= 19), buttonWidth, 19, &bmd->res,

Modified: branches/blender-2.47/source/blender/src/editseq.c
===================================================================
--- branches/blender-2.47/source/blender/src/editseq.c	2008-07-25 03:13:16 UTC (rev 15752)
+++ branches/blender-2.47/source/blender/src/editseq.c	2008-07-25 03:34:05 UTC (rev 15753)
@@ -122,14 +122,29 @@
 	if(!_last_seq_init) {
 		Editing *ed;
 		Sequence *seq;
+		Sequence *l_sel = NULL;
+		Sequence *l_act = NULL;
 
 		ed= G.scene->ed;
 		if(!ed) return NULL;
 
-		for(seq= ed->seqbasep->first; seq; seq=seq->next)
+		for(seq= ed->seqbasep->first; seq; seq=seq->next) {
+			if(seq->flag & SEQ_ACTIVE)
+				l_act = seq;
 			if(seq->flag & SELECT)
-				_last_seq= seq;
+				l_sel = seq;
+		}
 
+		if (l_act) {
+			_last_seq = l_act;
+		} else {
+			_last_seq = l_sel;
+		}
+
+		if (_last_seq) {
+			_last_seq->flag |= SEQ_ACTIVE;
+		}
+
 		_last_seq_init = 1;
 	}
 
@@ -138,12 +153,23 @@
 
 void set_last_seq(Sequence *seq)
 {
+	if (_last_seq_init && _last_seq) {
+		_last_seq->flag &= ~SEQ_ACTIVE;
+	}
+
 	_last_seq = seq;
 	_last_seq_init = 1;
+
+	if (_last_seq) {
+		_last_seq->flag |= SEQ_ACTIVE;
+	}
 }
 
-void clear_last_seq(Sequence *seq)
+void clear_last_seq()
 {
+	if (_last_seq_init && _last_seq) {
+		_last_seq->flag &= ~SEQ_ACTIVE;
+	}
 	_last_seq = NULL;
 	_last_seq_init = 0;
 }
@@ -2261,6 +2287,8 @@
 				"handled in duplicate!\nExpect a crash"
 						" now...\n");
 	}
+
+	seqn->flag &= ~SEQ_ACTIVE;
 	
 	return seqn;
 }





More information about the Bf-blender-cvs mailing list