Revision: 50241
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50241
Author: nazgul
Date: 2012-08-27 09:02:26 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Merging r50237 through r50240 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50237
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50240
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_scopes.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-50236
+
/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-50240
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
2012-08-27 09:01:36 UTC (rev 50240)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
2012-08-27 09:02:26 UTC (rev 50241)
@@ -208,8 +208,10 @@
/* free modifiers */
BKE_sequence_modifier_clear(seq);
- BKE_sequencer_cache_cleanup_sequence(seq);
- BKE_sequencer_preprocessed_cache_cleanup_sequence(seq);
+ /* free cached data used by this strip,
+ * also invalidate cache for all dependent sequences
+ */
+ BKE_sequence_invalidate_cache(scene, seq);
MEM_freeN(seq);
}
@@ -2945,6 +2947,9 @@
/* check whether sequence cur depends on seq */
int BKE_sequence_check_depend(Sequence *seq, Sequence *cur)
{
+ if (cur->seq1 == seq || cur->seq2 == seq || cur->seq3 == seq)
+ return TRUE;
+
/* sequences are not intersecting in time, assume no dependency exists
between them */
if (cur->enddisp < seq->startdisp || cur->startdisp > seq->enddisp)
return FALSE;
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-50236
+ /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-50240
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-50236
+
/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-50240
Modified:
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_scopes.c
===================================================================
---
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_scopes.c
2012-08-27 09:01:36 UTC (rev 50240)
+++
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_scopes.c
2012-08-27 09:02:26 UTC (rev 50241)
@@ -60,16 +60,14 @@
pos[3] = 255;
}
-static void scope_put_pixel_single(unsigned char *table, unsigned char *pos,
- int col)
+static void scope_put_pixel_single(unsigned char *table, unsigned char *pos,
int col)
{
char newval = table[pos[col]];
pos[col] = newval;
pos[3] = 255;
}
-static void wform_put_line(int w,
- unsigned char *last_pos, unsigned char *new_pos)
+static void wform_put_line(int w, unsigned char *last_pos, unsigned char
*new_pos)
{
if (last_pos > new_pos) {
unsigned char *temp = new_pos;
@@ -86,8 +84,7 @@
}
}
-static void wform_put_line_single(
- int w, unsigned char *last_pos, unsigned char *new_pos, int col)
+static void wform_put_line_single(int w, unsigned char *last_pos, unsigned
char *new_pos, int col)
{
if (last_pos > new_pos) {
unsigned char *temp = new_pos;
@@ -161,8 +158,7 @@
wform_put_grid(tgt, w, h);
for (x = 0; x < 256; x++) {
- wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
- waveform_gamma) * 255);
+ wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
waveform_gamma) * 255);
}
for (y = 0; y < ibuf->y; y++) {
@@ -204,8 +200,7 @@
wform_put_grid(tgt, w, h);
for (x = 0; x < 256; x++) {
- wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
- waveform_gamma) * 255);
+ wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
waveform_gamma) * 255);
}
for (y = 0; y < ibuf->y; y++) {
@@ -249,8 +244,7 @@
static ImBuf *make_sep_waveform_view_from_ibuf_byte(ImBuf *ibuf)
{
- ImBuf *rval = IMB_allocImBuf(
- ibuf->x + 3, 515, 32, IB_rect);
+ ImBuf *rval = IMB_allocImBuf(ibuf->x + 3, 515, 32, IB_rect);
int x, y;
unsigned char *src = (unsigned char *) ibuf->rect;
unsigned char *tgt = (unsigned char *) rval->rect;
@@ -263,8 +257,7 @@
wform_put_grid(tgt, w, h);
for (x = 0; x < 256; x++) {
- wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
- waveform_gamma) * 255);
+ wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
waveform_gamma) * 255);
}
for (y = 0; y < ibuf->y; y++) {
@@ -275,16 +268,14 @@
unsigned char *rgb = src + 4 * (ibuf->x * y + x);
for (c = 0; c < 3; c++) {
unsigned char *p = tgt;
- p += 4 * (w * ((rgb[c] * (h - 3)) / 255 + 1) +
- c * sw + x / 3 + 1);
+ p += 4 * (w * ((rgb[c] * (h - 3)) / 255 + 1) +
c * sw + x / 3 + 1);
scope_put_pixel_single(wtable, p, c);
p += 4 * w;
scope_put_pixel_single(wtable, p, c);
if (last_p[c] != NULL) {
- wform_put_line_single(
- w, last_p[c], p, c);
+ wform_put_line_single(w, last_p[c], p,
c);
}
last_p[c] = p;
}
@@ -311,8 +302,7 @@
wform_put_grid(tgt, w, h);
for (x = 0; x < 256; x++) {
- wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
- waveform_gamma) * 255);
+ wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
waveform_gamma) * 255);
}
for (y = 0; y < ibuf->y; y++) {
@@ -327,16 +317,14 @@
CLAMP(v, 0.0f, 1.0f);
- p += 4 * (w * ((int) (v * (h - 3)) + 1) +
- c * sw + x / 3 + 1);
+ p += 4 * (w * ((int) (v * (h - 3)) + 1) + c *
sw + x / 3 + 1);
scope_put_pixel_single(wtable, p, c);
p += 4 * w;
scope_put_pixel_single(wtable, p, c);
if (last_p[c] != NULL) {
- wform_put_line_single(
- w, last_p[c], p, c);
+ wform_put_line_single(w, last_p[c], p,
c);
}
last_p[c] = p;
}
@@ -470,7 +458,7 @@
unsigned int bins[3][256];
- memset(bins, 0, 3 * 256 * sizeof(unsigned int));
+ memset(bins, 0, sizeof(bins));
for (y = 0; y < ibuf->y; y++) {
for (x = 0; x < ibuf->x; x++) {
@@ -492,10 +480,8 @@
for (c = 0; c < 3; c++) {
for (x = 0; x < 256; x++) {
- draw_histogram_bar(rval, x * 2 + 1,
- ((float) bins[c][x]) / n, c);
- draw_histogram_bar(rval, x * 2 + 2,
- ((float) bins[c][x]) / n, c);
+ draw_histogram_bar(rval, x * 2 + 1, ((float)
bins[c][x]) / n, c);
+ draw_histogram_bar(rval, x * 2 + 2, ((float)
bins[c][x]) / n, c);
}
}
@@ -507,10 +493,10 @@
static int get_bin_float(float f)
{
if (f < -0.25f) {
- f = -0.25f;
+ return 0;
}
- else if (f > 1.25f) {
- f = 1.25f;
+ else if (f >= 1.25f) {
+ return 511;
}
return (int) (((f + 0.25f) / 1.5f) * 512);
@@ -524,7 +510,7 @@
unsigned int bins[3][512];
- memset(bins, 0, 3 * 256 * sizeof(unsigned int));
+ memset(bins, 0, sizeof(bins));
for (y = 0; y < ibuf->y; y++) {
for (x = 0; x < ibuf->x; x++) {
@@ -567,9 +553,7 @@
}
}
-static void vectorscope_put_cross(unsigned char r, unsigned char g,
- unsigned char b,
- char *tgt, int w, int h, int size)
+static void vectorscope_put_cross(unsigned char r, unsigned char g, unsigned
char b, char *tgt, int w, int h, int size)
{
float rgb[3], yuv[3];
char *p;
@@ -609,8 +593,7 @@
unsigned char wtable[256];
for (x = 0; x < 256; x++) {
- wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
- scope_gamma) * 255);
+ wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
scope_gamma) * 255);
}
for (x = 0; x <= 255; x++) {
@@ -656,8 +639,7 @@
unsigned char wtable[256];
for (x = 0; x < 256; x++) {
- wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
- scope_gamma) * 255);
+ wtable[x] = (unsigned char) (pow(((float) x + 1) / 256,
scope_gamma) * 255);
}
for (x = 0; x <= 255; x++) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
