[Bf-blender-cvs] [d789db6d491] temp-gpencil-io: More code cleanup

Antonio Vazquez noreply at git.blender.org
Wed Mar 3 13:43:54 CET 2021


Commit: d789db6d491f091571eebafe265aadfb5ad857ce
Author: Antonio Vazquez
Date:   Wed Mar 3 13:43:49 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rBd789db6d491f091571eebafe265aadfb5ad857ce

More code cleanup

===================================================================

M	source/blender/io/gpencil/intern/gpencil_io_base.cc

===================================================================

diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index ec3d2e3cfa9..30f3314fcf7 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -86,9 +86,9 @@ GpencilIO::GpencilIO(const struct GpencilIOParams *iparams)
   cfra_ = iparams->frame_cur;
 
   /* Calculate camera matrix. */
-  Object *cam_ob = (Object *)params_.v3d->camera;
+  Object *cam_ob = params_.v3d->camera;
   if (cam_ob != NULL) {
-    RenderData *re = &scene_->r;
+    RenderData *rd = &scene_->r;
     CameraParams params;
 
     /* Setup parameters. */
@@ -96,7 +96,7 @@ GpencilIO::GpencilIO(const struct GpencilIOParams *iparams)
     BKE_camera_params_from_object(&params, cam_ob);
 
     /* Compute matrix, viewplane, .. */
-    BKE_camera_params_compute_viewplane(&params, re->xsch, re->ysch, re->xasp, re->yasp);
+    BKE_camera_params_compute_viewplane(&params, rd->xsch, rd->ysch, rd->xasp, rd->yasp);
     BKE_camera_params_compute_matrix(&params);
 
     float viewmat[4][4];



More information about the Bf-blender-cvs mailing list