Commit: 9d29b49a57921f8ec71ea88919d94c4334de6566
Author: Mateusz Grzeliński
Date: Wed Aug 19 10:33:55 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB9d29b49a57921f8ec71ea88919d94c4334de6566
Merge branch 'master' into soc-2020-info-editor
# Conflicts:
# source/blender/python/intern/CMakeLists.txt
# source/blender/python/intern/bpy_interface.c
===================================================================
===================================================================
diff --cc source/blender/editors/interface/interface_ops.c
index e389698b5b6,e47761236ca..2c8651e2a47
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@@ -1302,13 -1292,14 +1295,14 @@@ static int editsource_text_edit(bContex
const int line)
{
struct Main *bmain = CTX_data_main(C);
- Text *text;
+ Text *text = NULL;
/* Developers may wish to copy-paste to an external editor. */
- printf("%s:%d\n", filepath, line);
+ CLOG_INFO(&LOG, "%s:%d", filepath, line);
- for (text = bmain->texts.first; text; text = text->id.next) {
- if (text->filepath && BLI_path_cmp(text->filepath, filepath) == 0) {
+ LISTBASE_FOREACH (Text *, text_iter, &bmain->texts) {
+ if (text_iter->filepath && BLI_path_cmp(text_iter->filepath, filepath) ==
0) {
+ text = text_iter;
break;
}
}
diff --cc source/blender/editors/space_info/textview.c
index c779e9483df,4d9a4fb2706..e87df4b6046
--- a/source/blender/editors/space_info/textview.c
+++ b/source/blender/editors/space_info/textview.c
@@@ -284,12 -235,10 +282,12 @@@ static bool textview_draw_string(TextVi
}
if (icon) {
- int vpadding = (tds->lheight + (tds->row_vpadding * 2) -
UI_DPI_ICON_SIZE) / 2;
- int hpadding = tds->draw_rect->xmin - (UI_DPI_ICON_SIZE * 1.3f);
+ const int vpadding = (tds->lheight + (tds->row_vpadding * pad_after) +
+ (tds->row_vpadding * pad_before) -
UI_DPI_ICON_SIZE) /
+ 2;
+ const int hpadding = tds->draw_rect->xmin - (UI_DPI_ICON_SIZE * 1.3f);
- GPU_blend(true);
+ GPU_blend(GPU_BLEND_ALPHA);
UI_icon_draw_ex(hpadding,
line_top - UI_DPI_ICON_SIZE - vpadding,
icon,
@@@ -298,12 -247,10 +296,12 @@@
0.0f,
icon_fg,
false);
- GPU_blend(false);
+ GPU_blend(GPU_BLEND_NONE);
}
- tds->xy[1] += tds->row_vpadding;
+ if (pad_after) {
+ tds->xy[1] += tds->row_vpadding;
+ }
/* Last part needs no clipping. */
const int final_offset = offsets[tot_lines - 1];
diff --cc source/blender/io/alembic/exporter/abc_export_capi.cc
index 872fd324a9a,6412379c126..dcb8f5bca85
--- a/source/blender/io/alembic/exporter/abc_export_capi.cc
+++ b/source/blender/io/alembic/exporter/abc_export_capi.cc
@@@ -150,9 -153,9 +153,9 @@@ static void export_startjob(void *custo
// Update the scene for the next frame to render.
scene->r.cfra = static_cast<int>(frame);
scene->r.subframe = frame - scene->r.cfra;
- BKE_scene_graph_update_for_newframe(data->depsgraph, data->bmain);
+ BKE_scene_graph_update_for_newframe(data->depsgraph);
- CLOG_INFO(&LOG, 2, "Exporting frame %.2f", frame);
+ CLOG_VERBOSE(&LOG, 2, "Exporting frame %.2f", frame);
ExportSubset export_subset =
abc_archive->export_subset_for_frame(frame);
iter.set_export_subset(export_subset);
iter.iterate_and_write();
diff --cc source/blender/python/intern/CMakeLists.txt
index 31a8289dfa4,44949c478cc..3f1e8eec845
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@@ -62,7 -62,7 +62,8 @@@ set(SR
bpy_gizmo_wrap.c
bpy_interface.c
bpy_interface_atexit.c
+ bpy_interface_inoutwrapper.c
+ bpy_interface_run.c
bpy_intern_string.c
bpy_library_load.c
bpy_library_write.c
diff --cc source/blender/python/intern/bpy_interface.c
index 610ac896ab5,b0b36baa839..89c6142d8f5
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@@ -24,9 -24,8 +24,10 @@@
* be accesses from scripts.
*/
+#include <BKE_report.h>
+#include <BLT_translation.h>
#include <Python.h>
+ #include <frameobject.h>
#include "MEM_guardedalloc.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
