BogdanNagirniak/blender
0
0
Fork 3
forked from blender/blender
Code Pull Requests Activity

BLEN-367: Fix code style #14

Merged
Bogdan Nagirniak merged 11 commits from BLEN-367 into hydra-render 2023-03-15 09:42:17 +01:00
Conversation 0 Commits 11 Files Changed 43 +10 -19
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 80af3c861c - Show all commits

23
source/blender/render/hydra/utils.cc
View File

@ -20,22 +20,13 @@ namespace blender::render::hydra {
pxr::GfMatrix4d gf_matrix_from_transform(float m[4][4]) pxr::GfMatrix4d gf_matrix_from_transform(float m[4][4])
{ {
return pxr::GfMatrix4d(m[0][0], pxr::GfMatrix4d ret = pxr::GfMatrix4d();
m[0][1], for (int i = 0; i < 4; i++) {
m[0][2], for (int j = 0; j < 4; j++) {
m[0][3], ret[i][j] = m[i][j];
m[1][0], }
m[1][1], }
m[1][2], return ret;
m[1][3],
m[2][0],
m[2][1],
m[2][2],
m[2][3],
m[3][0],
m[3][1],
m[3][2],
m[3][3]);
} }
std::string format_duration(std::chrono::milliseconds millisecs) std::string format_duration(std::chrono::milliseconds millisecs)

6
source/blender/render/hydra/viewport_engine.cc
View File

@ -7,12 +7,12 @@
#include <pxr/imaging/glf/drawTarget.h> #include <pxr/imaging/glf/drawTarget.h>
#include <pxr/usd/usdGeom/camera.h> #include <pxr/usd/usdGeom/camera.h>
#include "DNA_camera_types.h"
#include "DNA_screen_types.h"
#include "DNA_vec_types.h" /* this include should be before BKE_camera.h due to "rctf" type */
#include "BKE_camera.h" #include "BKE_camera.h"
#include "BLI_math_matrix.h" #include "BLI_math_matrix.h"
#include "DEG_depsgraph_query.h" #include "DEG_depsgraph_query.h"
#include "DNA_camera_types.h"
#include "DNA_screen_types.h"
#include "DNA_vec_types.h"
#include "GPU_shader.h" #include "GPU_shader.h"
#include "glog/logging.h" #include "glog/logging.h"