griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert changes from main commits that were merged into blender-v4.1-release

Browse Source 
The last good commit was f57e4c5b98.

After this one more fix was committed, this one is preserved as well:
67bd678887.
This commit is contained in:
Brecht Van Lommel
2024-03-18 14:49:11 +01:00
parent 4842bf1101
commit 7a395e2e7f
3443 changed files with 70508 additions and 264669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/python/intern/bpy_interface.cc
View File

@@ -29,7 +29,7 @@
#include "BLI_threads.h"
#include "BLI_utildefines.h"
#include "BLT_translation.hh"
#include "BLT_translation.h"
#include "RNA_types.hh"
@@ -47,7 +47,7 @@
#include "BKE_appdir.hh"
#include "BKE_context.hh"
#include "BKE_global.hh" /* Only for script checking. */
#include "BKE_global.h" /* Only for script checking. */
#include "BKE_main.hh"
#include "BKE_text.h"
@@ -128,10 +128,10 @@ void bpy_context_set(bContext *C, PyGILState_STATE *gilstate)
#ifdef TIME_PY_RUN
if (bpy_timer_count == 0) {
/* Record time from the beginning. */
bpy_timer = BLI_time_now_seconds();
bpy_timer = BLI_check_seconds_timer();
bpy_timer_run = bpy_timer_run_tot = 0.0;
}
bpy_timer_run = BLI_time_now_seconds();
bpy_timer_run = BLI_check_seconds_timer();
bpy_timer_count++;
#endif
@@ -157,7 +157,7 @@ void bpy_context_clear(bContext * /*C*/, const PyGILState_STATE *gilstate)
#endif
#ifdef TIME_PY_RUN
bpy_timer_run_tot += BLI_time_now_seconds() - bpy_timer_run;
bpy_timer_run_tot += BLI_check_seconds_timer() - bpy_timer_run;
bpy_timer_count++;
#endif
}
@@ -593,7 +593,7 @@ void BPY_python_end(const bool do_python_exit)
#ifdef TIME_PY_RUN
/* Measure time since Python started. */
bpy_timer = BLI_time_now_seconds() - bpy_timer;
bpy_timer = BLI_check_seconds_timer() - bpy_timer;
printf("*bpy stats* - ");
printf("tot exec: %d, ", bpy_timer_count);