[Bf-blender-cvs] [cd24c4b30aa] temp-trimesh-sculpt: prepare for merge

[Joseph Eagar]

Commit: cd24c4b30aa6af4d3f00cbbe52c57060b6b6825d
Author: Joseph Eagar
Date:   Thu Oct 1 03:20:15 2020 -0700
Branches: temp-trimesh-sculpt
https://developer.blender.org/rBcd24c4b30aa6af4d3f00cbbe52c57060b6b6825d

prepare for merge

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

M	intern/cycles/kernel/kernel_types.h
M	source/blender/blenkernel/intern/pbvh_intern.h
M	source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 951dcbe0eb0..efd283fce0a 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -1392,7 +1392,7 @@ typedef struct KernelIntegrator {
   int start_sample;
 
   int max_closures;
-  int pad1;
+  int pad1, pad2, pad3;
 } KernelIntegrator;
 static_assert_align(KernelIntegrator, 16);
 
diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h
index 5ba3c746f82..3c14310ad6f 100644
--- a/source/blender/blenkernel/intern/pbvh_intern.h
+++ b/source/blender/blenkernel/intern/pbvh_intern.h
@@ -1,3 +1,6 @@
+#ifndef _PBVH_INTERN_H
+#define _PBVH_INTERN_H
+
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -270,4 +273,4 @@ bool pbvh_trimesh_node_nearest_to_ray(PBVHNode *node,
 
 void pbvh_trimesh_normals_update(PBVHNode **nodes, int totnode);
 
-#endif
+#endif /* _PBVH_INTERN_H */
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 454b4296ce9..9c3a411d47a 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -7414,6 +7414,7 @@ float SCULPT_raycast_init(ViewContext *vc,
   Object *ob = vc->obact;
   RegionView3D *rv3d = vc->region->regiondata;
   View3D *v3d = vc->v3d;
+  SculptSession *ss = ob->sculpt;
 
   /* TODO: what if the segment is totally clipped? (return == 0). */
   ED_view3d_win_to_segment_clipped(
@@ -7432,7 +7433,7 @@ float SCULPT_raycast_init(ViewContext *vc,
 
   if ((rv3d->is_persp == false) &&
       /* If the ray is clipped, don't adjust its start/end. */
-      RV3D_CLIPPING_ENABLED(v3d, rv3d)) {
+      RV3D_CLIPPING_ENABLED(v3d, cdrv3d)) {
     BKE_pbvh_raycast_project_ray_root(ob->sculpt->pbvh, original, ray_start, ray_end, ray_normal);
 
     /* rRecalculate the normal. */