Revision: 15708
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15708
Author: campbellbarton
Date: 2008-07-23 09:17:20 +0200 (Wed, 23 Jul 2008)
Log Message:
-----------
svn merge -r15698:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/apricot/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
branches/apricot/projectfiles_vc7/blender/src/BL_src.vcproj
branches/apricot/source/blender/blenkernel/intern/scene.c
branches/apricot/source/blender/makesdna/DNA_sequence_types.h
branches/apricot/source/blender/python/api2_2x/doc/Ipo.py
branches/apricot/source/blender/src/buttons_logic.c
branches/apricot/source/blender/src/editseq.c
branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/apricot/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/apricot/source/gameengine/Ketsji/KX_ConstraintActuator.h
Modified: branches/apricot/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
===================================================================
--- branches/apricot/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
2008-07-23 07:11:23 UTC (rev 15707)
+++ branches/apricot/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
2008-07-23 07:17:20 UTC (rev 15708)
@@ -472,6 +472,9 @@
RelativePath="..\..\..\source\blender\makesdna\DNA_fileglobal_types.h">
</File>
<File
+
RelativePath="..\..\..\source\blender\makesdna\DNA_gpencil_types.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesdna\DNA_group_types.h">
</File>
<File
Modified: branches/apricot/projectfiles_vc7/blender/src/BL_src.vcproj
===================================================================
--- branches/apricot/projectfiles_vc7/blender/src/BL_src.vcproj 2008-07-23
07:11:23 UTC (rev 15707)
+++ branches/apricot/projectfiles_vc7/blender/src/BL_src.vcproj 2008-07-23
07:17:20 UTC (rev 15708)
@@ -182,6 +182,9 @@
RelativePath="..\..\..\source\blender\src\drawdeps.c">
</File>
<File
+
RelativePath="..\..\..\source\blender\src\drawgpencil.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\drawimage.c">
</File>
<File
@@ -233,6 +236,9 @@
RelativePath="..\..\..\source\blender\src\editaction.c">
</File>
<File
+
RelativePath="..\..\..\source\blender\src\editaction_gpencil.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\editarmature.c">
</File>
<File
@@ -350,6 +356,9 @@
RelativePath="..\..\..\source\blender\src\glutil.c">
</File>
<File
+
RelativePath="..\..\..\source\blender\src\gpencil.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\hddaudio.c">
</File>
<File
@@ -618,6 +627,9 @@
RelativePath="..\..\..\source\blender\include\BDR_editobject.h">
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BDR_gpencil.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BDR_imagepaint.h">
</File>
<File
@@ -636,6 +648,9 @@
RelativePath="..\..\..\source\blender\include\BIF_cursors.h">
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BIF_drawgpencil.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BIF_drawimage.h">
</File>
<File
Modified: branches/apricot/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/apricot/source/blender/blenkernel/intern/scene.c 2008-07-23
07:11:23 UTC (rev 15707)
+++ branches/apricot/source/blender/blenkernel/intern/scene.c 2008-07-23
07:17:20 UTC (rev 15708)
@@ -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/apricot/source/blender/makesdna/DNA_sequence_types.h
===================================================================
--- branches/apricot/source/blender/makesdna/DNA_sequence_types.h
2008-07-23 07:11:23 UTC (rev 15707)
+++ branches/apricot/source/blender/makesdna/DNA_sequence_types.h
2008-07-23 07:17:20 UTC (rev 15708)
@@ -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/apricot/source/blender/python/api2_2x/doc/Ipo.py
===================================================================
--- branches/apricot/source/blender/python/api2_2x/doc/Ipo.py 2008-07-23
07:11:23 UTC (rev 15707)
+++ branches/apricot/source/blender/python/api2_2x/doc/Ipo.py 2008-07-23
07:17:20 UTC (rev 15708)
@@ -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/apricot/source/blender/src/buttons_logic.c
===================================================================
--- branches/apricot/source/blender/src/buttons_logic.c 2008-07-23 07:11:23 UTC
(rev 15707)
+++ branches/apricot/source/blender/src/buttons_logic.c 2008-07-23 07:17:20 UTC
(rev 15708)
@@ -2062,7 +2062,7 @@
coa->time = 0;
uiDefButS(block, MENU, 1, str, xco+10, yco-65,
70, 19, &coa->flag, 0.0, 0.0, 0, 0, "");
- uiDefButS(block, NUM, 0, "Damp:", xco+10,
yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
+ uiDefButS(block, NUM, 0, "damp", xco+10,
yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant
(in frame) of low pass filter");
uiDefBut(block, LABEL, 0, "Min",
xco+80, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
uiDefBut(block, LABEL, 0, "Max",
xco+80+(width-90)/2, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
@@ -2084,7 +2084,7 @@
str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z
axis %x4|-X axis %x8|-Y axis %x16|-Z axis %x32";
uiDefButS(block, MENU, B_REDR, str, xco+10,
yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Set the direction of the ray");
- uiDefButS(block, NUM, 0, "Damp:", xco+10,
yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
+ uiDefButS(block, NUM, 0, "damp", xco+10,
yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant
(in frame) of low pass filter");
uiDefBut(block, LABEL, 0, "Range",
xco+80, yco-45, (width-115)/2, 19, NULL, 0.0, 0.0, 0, 0, "Set the maximum
length of ray");
uiDefButBitS(block, TOG, ACT_CONST_DISTANCE, B_REDR,
"Dist", xco+80+(width-115)/2, yco-45, (width-115)/2, 19, &coa->flag, 0.0,
0.0, 0, 0, "Force distance of object to point of impact of ray");
@@ -2124,7 +2124,7 @@
str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z
axis %x4";
uiDefButS(block, MENU, B_REDR, str, xco+10,
yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Select the axis to be aligned
along the reference direction");
- uiDefButS(block, NUM, 0, "Damp:", xco+10,
yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
+ uiDefButS(block, NUM, 0, "damp", xco+10,
yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant
(in frame) of low pass filter");
uiDefBut(block, LABEL, 0, "X", xco+80,
yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
uiDefBut(block, LABEL, 0, "Y",
xco+80+(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
uiDefBut(block, LABEL, 0, "Z",
xco+80+2*(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
@@ -2133,7 +2133,9 @@
uiDefButF(block, NUM, 0, "",
xco+80+(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[1], -2000.0,
2000.0, 10, 0, "Y component of reference direction");
uiDefButF(block, NUM, 0, "",
xco+80+2*(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[2], -2000.0,
2000.0, 10, 0, "Z component of reference direction");
- uiDefButS(block, NUM, 0, "time", xco+10, yco-84,
70+(width-115)/3, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time
in frame, 0 for unlimited");
+ uiDefButS(block, NUM, 0, "time", xco+10, yco-84, 70,
19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for
unlimited");
+ uiDefButF(block, NUM, 0, "min", xco+80, yco-84,
(width-115)/2, 19, &(coa->minloc[0]), 0.0, 180.0, 10, 1, "Minimum angle (in
degree) to maintain with target direction. No correction is done if angle with
target direction is between min and max");
+ uiDefButF(block, NUM, 0, "max", xco+80+(width-115)/2,
yco-84, (width-115)/2, 19, &(coa->maxloc[0]), 0.0, 180.0, 10, 1, "Maximum angle
(in degree) allowed with target direction. No correction is done if angle with
target direction is between min and max");
}
str= "Constraint Type %t|Location %x0|Distance %x1|Orientation
%x2";
but = uiDefButS(block, MENU, B_REDR, str, xco+40,
yco-23, (width-80), 19, &coa->type, 0.0, 0.0, 0, 0, "");
Modified: branches/apricot/source/blender/src/editseq.c
===================================================================
--- branches/apricot/source/blender/src/editseq.c 2008-07-23 07:11:23 UTC
(rev 15707)
+++ branches/apricot/source/blender/src/editseq.c 2008-07-23 07:17:20 UTC
(rev 15708)
@@ -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;
}
Modified: branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
