[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56913] tags/blender-2.67a-release/blender : svn merge ^/trunk/ blender -c56892 -c56894 -c56896 -c56897 -c56898 -c56901 -c56902 -c56905 -c56906 -c56912
Campbell Barton
ideasman42 at gmail.com
Sun May 19 14:26:20 CEST 2013
Revision: 56913
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56913
Author: campbellbarton
Date: 2013-05-19 12:26:20 +0000 (Sun, 19 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56892 -c56894 -c56896 -c56897 -c56898 -c56901 -c56902 -c56905 -c56906 -c56912
Modified Paths:
--------------
tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowX11.cpp
tags/blender-2.67a-release/blender/source/blender/editors/animation/anim_draw.c
tags/blender-2.67a-release/blender/source/blender/editors/include/ED_anim_api.h
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_cursor.c
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_stroke.c
tags/blender-2.67a-release/blender/source/blender/editors/space_action/space_action.c
tags/blender-2.67a-release/blender/source/blender/editors/space_graph/space_graph.c
tags/blender-2.67a-release/blender/source/blender/editors/space_nla/space_nla.c
tags/blender-2.67a-release/blender/source/blender/editors/space_sequencer/sequencer_draw.c
tags/blender-2.67a-release/blender/source/blender/freestyle/intern/system/RenderMonitor.h
tags/blender-2.67a-release/blender/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
tags/blender-2.67a-release/blender/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
tags/blender-2.67a-release/blender/source/gameengine/Converter/BL_ActionActuator.cpp
Property Changed:
----------------
tags/blender-2.67a-release/blender/
Property changes on: tags/blender-2.67a-release/blender
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56868,56871-56873,56879-56882,56885,56890,56892,56896,56898,56907-56908
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56868,56871-56873,56879-56882,56885,56890,56892,56894,56896-56898,56901-56902,56905-56908,56912
Modified: tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-05-19 11:39:22 UTC (rev 56912)
+++ tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2013-05-19 12:26:20 UTC (rev 56913)
@@ -700,7 +700,9 @@
WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
WGL_COLOR_BITS_ARB, pfd.cColorBits,
WGL_DEPTH_BITS_ARB, pfd.cDepthBits,
+#ifdef GHOST_OPENGL_ALPHA
WGL_ALPHA_BITS_ARB, pfd.cAlphaBits,
+#endif
WGL_STENCIL_BITS_ARB, pfd.cStencilBits,
WGL_DOUBLE_BUFFER_ARB, GL_TRUE,
WGL_SAMPLE_BUFFERS_ARB, GL_TRUE,
@@ -1310,8 +1312,10 @@
weight += pfd.cColorBits - 8;
+#ifdef GHOST_OPENGL_ALPHA
if (pfd.cAlphaBits > 0)
weight ++;
+#endif
/* want swap copy capability -- it matters a lot */
if (pfd.dwFlags & PFD_SWAP_COPY) weight += 16;
Modified: tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2013-05-19 11:39:22 UTC (rev 56912)
+++ tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2013-05-19 12:26:20 UTC (rev 56913)
@@ -211,7 +211,9 @@
attributes[i++] = GLX_BLUE_SIZE; attributes[i++] = 1;
attributes[i++] = GLX_GREEN_SIZE; attributes[i++] = 1;
attributes[i++] = GLX_DEPTH_SIZE; attributes[i++] = 1;
+#ifdef GHOST_OPENGL_ALPHA
attributes[i++] = GLX_ALPHA_SIZE; attributes[i++] = 1;
+#endif
/* GLX >= 1.4 required for multi-sample */
if (samples && (glxVersionMajor >= 1) && (glxVersionMinor >= 4)) {
attributes[i++] = GLX_SAMPLE_BUFFERS; attributes[i++] = 1;
Modified: tags/blender-2.67a-release/blender/source/blender/editors/animation/anim_draw.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/editors/animation/anim_draw.c 2013-05-19 11:39:22 UTC (rev 56912)
+++ tags/blender-2.67a-release/blender/source/blender/editors/animation/anim_draw.c 2013-05-19 12:26:20 UTC (rev 56913)
@@ -251,7 +251,7 @@
/* Note: 'Preview Range' tools are defined in anim_ops.c */
/* Draw preview range 'curtains' for highlighting where the animation data is */
-void ANIM_draw_previewrange(const bContext *C, View2D *v2d)
+void ANIM_draw_previewrange(const bContext *C, View2D *v2d, int end_frame_width)
{
Scene *scene = CTX_data_scene(C);
@@ -262,9 +262,9 @@
glColor4f(0.0f, 0.0f, 0.0f, 0.4f);
/* only draw two separate 'curtains' if there's no overlap between them */
- if (PSFRA < PEFRA) {
+ if (PSFRA < PEFRA + end_frame_width) {
glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
- glRectf((float)PEFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+ glRectf((float)(PEFRA + end_frame_width), v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
}
else {
glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
Modified: tags/blender-2.67a-release/blender/source/blender/editors/include/ED_anim_api.h
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/editors/include/ED_anim_api.h 2013-05-19 11:39:22 UTC (rev 56912)
+++ tags/blender-2.67a-release/blender/source/blender/editors/include/ED_anim_api.h 2013-05-19 12:26:20 UTC (rev 56913)
@@ -491,7 +491,7 @@
/* ------------- Preview Range Drawing -------------- */
/* main call to draw preview range curtains */
-void ANIM_draw_previewrange(const struct bContext *C, struct View2D *v2d);
+void ANIM_draw_previewrange(const struct bContext *C, struct View2D *v2d, int end_frame_width);
/* ************************************************* */
/* F-MODIFIER TOOLS */
Modified: tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_cursor.c 2013-05-19 11:39:22 UTC (rev 56912)
+++ tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_cursor.c 2013-05-19 12:26:20 UTC (rev 56913)
@@ -809,7 +809,7 @@
/* TODO: as sculpt and other paint modes are unified, this
* special mode of drawing will go away */
- if (vc.obact && vc.obact->sculpt) {
+ if ((mode == PAINT_SCULPT) && vc.obact->sculpt) {
float location[3];
int pixel_radius, hit;
Modified: tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_stroke.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2013-05-19 11:39:22 UTC (rev 56912)
+++ tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_stroke.c 2013-05-19 12:26:20 UTC (rev 56913)
@@ -90,7 +90,9 @@
int stroke_started;
/* event that started stroke, for modal() return */
int event_type;
-
+ /* check if stroke variables have been initialized */
+ bool stroke_init;
+ /* check if various brush mapping variables have been initialized */
bool brush_init;
float initial_mouse[2];
/* cached_pressure stores initial pressure for size pressure influence mainly */
@@ -389,17 +391,17 @@
* are aligned nicely with no overlap. for this the spacing needs to be
* the average of the previous and next size. */
float s = paint_space_stroke_spacing(scene, stroke, 1.0f, pressure);
- float q = s*dpressure/(2.0f*length);
- float pressure_fac = (1.0f + q)/(1.0f - q);
+ float q = s * dpressure / (2.0f * length);
+ float pressure_fac = (1.0f + q) / (1.0f - q);
float last_size_pressure = stroke->last_pressure;
- float new_size_pressure = stroke->last_pressure*pressure_fac;
+ float new_size_pressure = stroke->last_pressure * pressure_fac;
/* average spacing */
float last_spacing = paint_space_stroke_spacing(scene, stroke, last_size_pressure, pressure);
float new_spacing = paint_space_stroke_spacing(scene, stroke, new_size_pressure, pressure);
- return 0.5f*(last_spacing + new_spacing);
+ return 0.5f * (last_spacing + new_spacing);
}
else {
/* no size pressure */
@@ -432,9 +434,9 @@
float spacing = paint_space_stroke_spacing_variable(scene, stroke, pressure, dpressure, length);
if (length >= spacing) {
- mouse[0] = stroke->last_mouse_position[0] + dmouse[0]*spacing;
- mouse[1] = stroke->last_mouse_position[1] + dmouse[1]*spacing;
- pressure = stroke->last_pressure + (spacing/length)*dpressure;
+ mouse[0] = stroke->last_mouse_position[0] + dmouse[0] * spacing;
+ mouse[1] = stroke->last_mouse_position[1] + dmouse[1] * spacing;
+ pressure = stroke->last_pressure + (spacing / length) * dpressure;
paint_brush_stroke_add_step(C, op, mouse, pressure);
@@ -654,7 +656,8 @@
PaintStroke *stroke = op->customdata;
PaintSample sample_average;
float mouse[2];
- int first = 0;
+ bool first_dab = false;
+ bool first_modal = false;
float zoomx, zoomy;
bool redraw = false;
float pressure;
@@ -675,23 +678,28 @@
if (event->type == NDOF_MOTION)
return OPERATOR_PASS_THROUGH;
+ /* one time initialization */
+ if(!stroke->stroke_init) {
+ stroke->smooth_stroke_cursor =
+ WM_paint_cursor_activate(CTX_wm_manager(C), paint_poll, paint_draw_smooth_stroke, stroke);
+
+ stroke->stroke_init = true;
+ first_modal = true;
+ }
+
+ /* one time stroke initialization */
if (!stroke->stroke_started) {
+ stroke->last_pressure = sample_average.pressure;
copy_v2_v2(stroke->last_mouse_position, sample_average.mouse);
- stroke->last_pressure = sample_average.pressure;
stroke->stroke_started = stroke->test_start(C, op, sample_average.mouse);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list