Revision: 56889
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56889
Author: campbellbarton
Date: 2013-05-18 06:52:58 +0000 (Sat, 18 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56871 -c56872 -c56873 -c56879 -c56880 -c56881
-c56882 -c56885
Modified Paths:
--------------
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/key.c
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/object.c
tags/blender-2.67a-release/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
tags/blender-2.67a-release/blender/source/blender/compositor/intern/COM_NodeOperation.h
tags/blender-2.67a-release/blender/source/blender/compositor/operations/COM_OutputFileOperation.h
tags/blender-2.67a-release/blender/source/blender/editors/interface/interface_handlers.c
tags/blender-2.67a-release/blender/source/blender/editors/physics/rigidbody_object.c
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_ops.c
tags/blender-2.67a-release/blender/source/blender/editors/space_sequencer/sequencer_draw.c
tags/blender-2.67a-release/blender/source/blender/python/mathutils/mathutils.c
tags/blender-2.67a-release/blender/source/blender/windowmanager/WM_api.h
tags/blender-2.67a-release/blender/source/blender/windowmanager/intern/wm_event_system.c
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
+
/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
Modified:
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/key.c
2013-05-17 19:21:13 UTC (rev 56888)
+++ tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/key.c
2013-05-18 06:52:58 UTC (rev 56889)
@@ -1389,10 +1389,6 @@
cp_cu_key(ob->data, key, actkb, kb, 0, tot, out, tot);
}
else {
- /* do shapekey local drivers */
- float ctime = BKE_scene_frame_get(scene);
-
- BKE_animsys_evaluate_animdata(scene, &key->id, key->adt, ctime,
ADT_RECALC_DRIVERS);
if (ob->type == OB_MESH) do_mesh_key(scene, ob, key, out, tot);
else if (ob->type == OB_LATTICE) do_latt_key(scene, ob, key,
out, tot);
Modified:
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/object.c
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/object.c
2013-05-17 19:21:13 UTC (rev 56888)
+++
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/object.c
2013-05-18 06:52:58 UTC (rev 56889)
@@ -2700,6 +2700,7 @@
if (ob->recalc & OB_RECALC_DATA) {
ID *data_id = (ID *)ob->data;
AnimData *adt = BKE_animdata_from_id(data_id);
+ Key *key;
float ctime = BKE_scene_frame_get(scene);
if (G.debug & G_DEBUG)
@@ -2710,6 +2711,12 @@
/* XXX: for mesh types, should we push this to
derivedmesh instead? */
BKE_animsys_evaluate_animdata(scene, data_id,
adt, ctime, ADT_RECALC_DRIVERS);
}
+
+ key = BKE_key_from_object(ob);
+ if (key && key->block.first) {
+ if (!(ob->shapeflag & OB_SHAPE_LOCK))
+ BKE_animsys_evaluate_animdata(scene,
&key->id, key->adt, ctime, ADT_RECALC_DRIVERS);
+ }
/* includes all keys and modifiers */
switch (ob->type) {
Modified:
tags/blender-2.67a-release/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
2013-05-17 19:21:13 UTC (rev 56888)
+++
tags/blender-2.67a-release/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
2013-05-18 06:52:58 UTC (rev 56889)
@@ -638,8 +638,27 @@
{
NodeOperation *operation = this->getOutputNodeOperation();
- if (operation->isOutputOperation(true) &&
!(operation->isViewerOperation() || operation->isPreviewOperation())) {
- BLI_rcti_init(&this->m_viewerBorder, xmin * this->m_width, xmax
* this->m_width,
- ymin * this->m_height, ymax * this->m_height);
+ if (operation->isOutputOperation(true)) {
+ /* Basically, setting border need to happen for only operatoins
+ * which operates in render resolution buffers (like compositor
+ * output nodes).
+ *
+ * In this cases adding border will lead to mapping coordinates
+ * from output buffer space to input buffer spaces when
executing
+ * operation.
+ *
+ * But nodes like viewer and file output just shall display or
+ * safe the same exact buffer which goes to their input, no need
+ * in any kind of coordinates mapping.
+ */
+
+ bool operationNeedsBorder = !(operation->isViewerOperation() ||
+ operation->isPreviewOperation() ||
+
operation->isFileOutputOperation());
+
+ if (operationNeedsBorder) {
+ BLI_rcti_init(&this->m_viewerBorder, xmin *
this->m_width, xmax * this->m_width,
+ ymin * this->m_height, ymax *
this->m_height);
+ }
}
}
Modified:
tags/blender-2.67a-release/blender/source/blender/compositor/intern/COM_NodeOperation.h
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/compositor/intern/COM_NodeOperation.h
2013-05-17 19:21:13 UTC (rev 56888)
+++
tags/blender-2.67a-release/blender/source/blender/compositor/intern/COM_NodeOperation.h
2013-05-18 06:52:58 UTC (rev 56889)
@@ -247,6 +247,7 @@
virtual bool isViewerOperation() { return false; }
virtual bool isPreviewOperation() { return false; }
+ virtual bool isFileOutputOperation() { return false; }
inline bool isBreaked() {
return this->m_btree->test_break(this->m_btree->tbh);
Modified:
tags/blender-2.67a-release/blender/source/blender/compositor/operations/COM_OutputFileOperation.h
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/compositor/operations/COM_OutputFileOperation.h
2013-05-17 19:21:13 UTC (rev 56888)
+++
tags/blender-2.67a-release/blender/source/blender/compositor/operations/COM_OutputFileOperation.h
2013-05-18 06:52:58 UTC (rev 56889)
@@ -56,6 +56,8 @@
void initExecution();
void deinitExecution();
const CompositorPriority getRenderPriority() const { return
COM_PRIORITY_LOW; }
+
+ bool isFileOutputOperation() { return true; }
};
/* extra info for OpenEXR layers */
@@ -90,6 +92,8 @@
void initExecution();
void deinitExecution();
const CompositorPriority getRenderPriority() const { return
COM_PRIORITY_LOW; }
+
+ bool isFileOutputOperation() { return true; }
};
#endif
Modified:
tags/blender-2.67a-release/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/editors/interface/interface_handlers.c
2013-05-17 19:21:13 UTC (rev 56888)
+++
tags/blender-2.67a-release/blender/source/blender/editors/interface/interface_handlers.c
2013-05-18 06:52:58 UTC (rev 56889)
@@ -7606,6 +7606,14 @@
ui_popup_block_free(C, menu);
UI_remove_popup_handlers(&CTX_wm_window(C)->modalhandlers,
menu);
+#ifdef USE_DRAG_TOGGLE
+ {
+ wmWindow *win = CTX_wm_window(C);
+ WM_event_free_ui_handler_all(C, &win->modalhandlers,
+
ui_handler_region_drag_toggle, ui_handler_region_drag_toggle_remove);
+ }
+#endif
+
if ((temp.menuretval & UI_RETURN_OK) || (temp.menuretval &
UI_RETURN_POPUP_OK)) {
if (temp.popup_func)
temp.popup_func(C, temp.popup_arg,
temp.retvalue);
Modified:
tags/blender-2.67a-release/blender/source/blender/editors/physics/rigidbody_object.c
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/editors/physics/rigidbody_object.c
2013-05-17 19:21:13 UTC (rev 56888)
+++
tags/blender-2.67a-release/blender/source/blender/editors/physics/rigidbody_object.c
2013-05-18 06:52:58 UTC (rev 56889)
@@ -153,6 +153,7 @@
if (change) {
/* send updates */
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
+ WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
/* done */
return OPERATOR_FINISHED;
@@ -197,6 +198,7 @@
if (change) {
/* send updates */
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
+ WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
/* done */
return OPERATOR_FINISHED;
@@ -289,6 +291,7 @@
if (change) {
/* send updates */
+ WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
/* done */
Modified:
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_ops.c
2013-05-17 19:21:13 UTC (rev 56888)
+++
tags/blender-2.67a-release/blender/source/blender/editors/sculpt_paint/paint_ops.c
2013-05-18 06:52:58 UTC (rev 56889)
@@ -271,17 +271,17 @@
}
/* get the next brush with the active tool */
- for (brush = first_brush;
- brush != brush_orig;
- brush = brush->id.next ? brush->id.next : bmain->brush.first)
- {
+ brush = first_brush;
+ do {
if ((brush->ob_mode & ob_mode) &&
(brush_tool(brush, tool_offset) == tool))
{
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
