[Bf-blender-cvs] [30f626fe4cd] master: Revert "Cycles API: encapsulate Node socket members"
Brecht Van Lommel
noreply at git.blender.org
Tue Oct 27 11:43:58 CET 2020
Commit: 30f626fe4cd62f406468ef0ff2169694424b1a29
Author: Brecht Van Lommel
Date: Tue Oct 27 11:40:42 2020 +0100
Branches: master
https://developer.blender.org/rB30f626fe4cd62f406468ef0ff2169694424b1a29
Revert "Cycles API: encapsulate Node socket members"
This reverts commit 527f8b32b32187f754e5b176db6377736f9cb8ff. It is causing
motion blur test failures and crashes in some renders, reverting until this is
fixed.
===================================================================
M intern/cycles/blender/blender_camera.cpp
M intern/cycles/blender/blender_curves.cpp
M intern/cycles/blender/blender_geometry.cpp
M intern/cycles/blender/blender_light.cpp
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/blender/blender_object.cpp
M intern/cycles/blender/blender_object_cull.cpp
M intern/cycles/blender/blender_particles.cpp
M intern/cycles/blender/blender_session.cpp
M intern/cycles/blender/blender_shader.cpp
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/blender/blender_sync.h
M intern/cycles/blender/blender_volume.cpp
M intern/cycles/bvh/bvh.cpp
M intern/cycles/bvh/bvh_build.cpp
M intern/cycles/bvh/bvh_embree.cpp
M intern/cycles/bvh/bvh_optix.cpp
M intern/cycles/bvh/bvh_split.cpp
M intern/cycles/bvh/bvh_unaligned.cpp
M intern/cycles/device/device_optix.cpp
M intern/cycles/graph/node.cpp
M intern/cycles/graph/node.h
M intern/cycles/render/attribute.cpp
M intern/cycles/render/background.cpp
M intern/cycles/render/background.h
M intern/cycles/render/bake.cpp
M intern/cycles/render/camera.cpp
M intern/cycles/render/camera.h
M intern/cycles/render/film.cpp
M intern/cycles/render/film.h
M intern/cycles/render/geometry.cpp
M intern/cycles/render/geometry.h
M intern/cycles/render/graph.cpp
M intern/cycles/render/hair.cpp
M intern/cycles/render/hair.h
M intern/cycles/render/image.cpp
M intern/cycles/render/image.h
M intern/cycles/render/integrator.cpp
M intern/cycles/render/integrator.h
M intern/cycles/render/light.cpp
M intern/cycles/render/light.h
M intern/cycles/render/mesh.cpp
M intern/cycles/render/mesh.h
M intern/cycles/render/mesh_displace.cpp
M intern/cycles/render/mesh_subdivision.cpp
M intern/cycles/render/nodes.cpp
M intern/cycles/render/nodes.h
M intern/cycles/render/object.cpp
M intern/cycles/render/object.h
M intern/cycles/render/osl.cpp
M intern/cycles/render/scene.cpp
M intern/cycles/render/session.cpp
M intern/cycles/render/shader.cpp
M intern/cycles/render/shader.h
M intern/cycles/render/svm.cpp
M intern/cycles/render/volume.cpp
M intern/cycles/render/volume.h
M intern/cycles/subd/subd_dice.cpp
M intern/cycles/subd/subd_split.cpp
M intern/cycles/test/render_graph_finalize_test.cpp
M intern/cycles/util/util_array.h
===================================================================
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index c1da9f1983f..e1ab3b3fbc1 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -388,19 +388,18 @@ static void blender_camera_sync(Camera *cam,
const char *viewname,
PointerRNA *cscene)
{
+ /* copy camera to compare later */
+ Camera prevcam = *cam;
float aspectratio, sensor_size;
/* viewplane */
- BoundBox2D viewplane;
- blender_camera_viewplane(bcam, width, height, &viewplane, &aspectratio, &sensor_size);
+ blender_camera_viewplane(bcam, width, height, &cam->viewplane, &aspectratio, &sensor_size);
- cam->set_viewplane_left(viewplane.left);
- cam->set_viewplane_right(viewplane.right);
- cam->set_viewplane_top(viewplane.top);
- cam->set_viewplane_bottom(viewplane.bottom);
+ cam->width = bcam->full_width;
+ cam->height = bcam->full_height;
- cam->set_full_width(width);
- cam->set_full_height(height);
+ cam->full_width = width;
+ cam->full_height = height;
/* panorama sensor */
if (bcam->type == CAMERA_PANORAMA && bcam->panorama_type == PANORAMA_FISHEYE_EQUISOLID) {
@@ -423,91 +422,85 @@ static void blender_camera_sync(Camera *cam,
}
if (horizontal_fit) {
- cam->set_sensorwidth(sensor_size);
- cam->set_sensorheight(sensor_size * fit_yratio / fit_xratio);
+ cam->sensorwidth = sensor_size;
+ cam->sensorheight = sensor_size * fit_yratio / fit_xratio;
}
else {
- cam->set_sensorwidth(sensor_size * fit_xratio / fit_yratio);
- cam->set_sensorheight(sensor_size);
+ cam->sensorwidth = sensor_size * fit_xratio / fit_yratio;
+ cam->sensorheight = sensor_size;
}
}
/* clipping distances */
- cam->set_nearclip(bcam->nearclip);
- cam->set_farclip(bcam->farclip);
+ cam->nearclip = bcam->nearclip;
+ cam->farclip = bcam->farclip;
/* type */
- cam->set_camera_type(bcam->type);
+ cam->type = bcam->type;
/* panorama */
- cam->set_panorama_type(bcam->panorama_type);
- cam->set_fisheye_fov(bcam->fisheye_fov);
- cam->set_fisheye_lens(bcam->fisheye_lens);
- cam->set_latitude_min(bcam->latitude_min);
- cam->set_latitude_max(bcam->latitude_max);
+ cam->panorama_type = bcam->panorama_type;
+ cam->fisheye_fov = bcam->fisheye_fov;
+ cam->fisheye_lens = bcam->fisheye_lens;
+ cam->latitude_min = bcam->latitude_min;
+ cam->latitude_max = bcam->latitude_max;
- cam->set_longitude_min(bcam->longitude_min);
- cam->set_longitude_max(bcam->longitude_max);
+ cam->longitude_min = bcam->longitude_min;
+ cam->longitude_max = bcam->longitude_max;
/* panorama stereo */
- cam->set_interocular_distance(bcam->interocular_distance);
- cam->set_convergence_distance(bcam->convergence_distance);
- cam->set_use_spherical_stereo(bcam->use_spherical_stereo);
+ cam->interocular_distance = bcam->interocular_distance;
+ cam->convergence_distance = bcam->convergence_distance;
+ cam->use_spherical_stereo = bcam->use_spherical_stereo;
- if (cam->get_use_spherical_stereo()) {
+ if (cam->use_spherical_stereo) {
if (strcmp(viewname, "left") == 0)
- cam->set_stereo_eye(Camera::STEREO_LEFT);
+ cam->stereo_eye = Camera::STEREO_LEFT;
else if (strcmp(viewname, "right") == 0)
- cam->set_stereo_eye(Camera::STEREO_RIGHT);
+ cam->stereo_eye = Camera::STEREO_RIGHT;
else
- cam->set_stereo_eye(Camera::STEREO_NONE);
+ cam->stereo_eye = Camera::STEREO_NONE;
}
- cam->set_use_pole_merge(bcam->use_pole_merge);
- cam->set_pole_merge_angle_from(bcam->pole_merge_angle_from);
- cam->set_pole_merge_angle_to(bcam->pole_merge_angle_to);
+ cam->use_pole_merge = bcam->use_pole_merge;
+ cam->pole_merge_angle_from = bcam->pole_merge_angle_from;
+ cam->pole_merge_angle_to = bcam->pole_merge_angle_to;
/* anamorphic lens bokeh */
- cam->set_aperture_ratio(bcam->aperture_ratio);
+ cam->aperture_ratio = bcam->aperture_ratio;
/* perspective */
- cam->set_fov(2.0f * atanf((0.5f * sensor_size) / bcam->lens / aspectratio));
- cam->set_focaldistance(bcam->focaldistance);
- cam->set_aperturesize(bcam->aperturesize);
- cam->set_blades(bcam->apertureblades);
- cam->set_bladesrotation(bcam->aperturerotation);
+ cam->fov = 2.0f * atanf((0.5f * sensor_size) / bcam->lens / aspectratio);
+ cam->focaldistance = bcam->focaldistance;
+ cam->aperturesize = bcam->aperturesize;
+ cam->blades = bcam->apertureblades;
+ cam->bladesrotation = bcam->aperturerotation;
/* transform */
- cam->set_matrix(blender_camera_matrix(bcam->matrix, bcam->type, bcam->panorama_type));
+ cam->matrix = blender_camera_matrix(bcam->matrix, bcam->type, bcam->panorama_type);
+ cam->motion.clear();
+ cam->motion.resize(bcam->motion_steps, cam->matrix);
+ cam->use_perspective_motion = false;
+ cam->shuttertime = bcam->shuttertime;
+ cam->fov_pre = cam->fov;
+ cam->fov_post = cam->fov;
+ cam->motion_position = bcam->motion_position;
- array<Transform> motion;
- motion.resize(bcam->motion_steps, cam->get_matrix());
- cam->set_motion(motion);
- cam->set_use_perspective_motion(false);
+ cam->rolling_shutter_type = bcam->rolling_shutter_type;
+ cam->rolling_shutter_duration = bcam->rolling_shutter_duration;
- cam->set_shuttertime(bcam->shuttertime);
- cam->set_fov_pre(cam->get_fov());
- cam->set_fov_post(cam->get_fov());
- cam->set_motion_position(bcam->motion_position);
-
- cam->set_rolling_shutter_type(bcam->rolling_shutter_type);
- cam->set_rolling_shutter_duration(bcam->rolling_shutter_duration);
-
- cam->set_shutter_curve(bcam->shutter_curve);
+ cam->shutter_curve = bcam->shutter_curve;
/* border */
- cam->set_border_left(bcam->border.left);
- cam->set_border_right(bcam->border.right);
- cam->set_border_top(bcam->border.top);
- cam->set_border_bottom(bcam->border.bottom);
-
- cam->set_viewport_camera_border_left(bcam->viewport_camera_border.left);
- cam->set_viewport_camera_border_right(bcam->viewport_camera_border.right);
- cam->set_viewport_camera_border_top(bcam->viewport_camera_border.top);
- cam->set_viewport_camera_border_bottom(bcam->viewport_camera_border.bottom);
+ cam->border = bcam->border;
+ cam->viewport_camera_border = bcam->viewport_camera_border;
bcam->offscreen_dicing_scale = RNA_float_get(cscene, "offscreen_dicing_scale");
- cam->set_offscreen_dicing_scale(bcam->offscreen_dicing_scale);
+ cam->offscreen_dicing_scale = bcam->offscreen_dicing_scale;
+
+ /* set update flag */
+ if (cam->modified(prevcam))
+ cam->tag_update();
}
/* Sync Render Camera */
@@ -589,24 +582,22 @@ void BlenderSync::sync_camera_motion(
Camera *cam = scene->camera;
BL::Array<float, 16> b_ob_matrix;
- b_engine.camera_model_matrix(b_ob, cam->get_use_spherical_stereo(), b_ob_matrix);
+ b_engine.camera_model_matrix(b_ob, cam->use_spherical_stereo, b_ob_matrix);
Transform tfm = get_transform(b_ob_matrix);
- tfm = blender_camera_matrix(tfm, cam->get_camera_type(), cam->get_panorama_type());
+ tfm = blender_camera_matrix(tfm, cam->type, cam->panorama_type);
if (motion_time == 0.0f) {
/* When motion blur is not centered in frame, cam->matrix gets reset. */
- cam->set_matrix(tfm);
+ cam->matrix = tfm;
}
/* Set transform in motion array. */
int motion_step = cam->motion_step(motion_time);
if (motion_step >= 0) {
- array<Transform> motion = cam->get_motion();
- motion[motion_step] = tfm;
- cam->set_motion(motion);
+ cam->motion[motion_step] = tfm;
}
- if (cam->get_camera_type() == CAMERA_PERSPECTIVE) {
+ if (cam->type == CAMERA_PERSPECTIVE) {
BlenderCamera bcam;
float aspectratio, sensor_size;
blender_camera_init(&bcam, b_render);
@@ -619,18 +610,18 @@ void BlenderSync::sync_camera_motion(
blender_camera_viewplane(&bcam, width, height, NULL, &aspectratio, &sensor_size);
/* TODO(sergey): De-duplicate calculation with camera sync. */
float fov = 2.0f * atanf((0.5f * sensor_size) / bcam.lens / aspectratio);
- if (fov != cam->get_fov()) {
+ if (fov != cam->fov) {
VLOG(1) << "Camera " << b_ob.name() << " FOV change detected.";
if (motion_time == 0.0f) {
- cam->set_fov(fov);
+ cam->fov = fov;
}
else if (motion_time == -1.0f) {
- cam->set_fov_pre(fov);
- cam->set_use_perspective_motion(true);
+ cam->fov_pre = fov;
+ cam->use_perspective_motion = true;
}
else if (motion_time == 1.0f) {
- cam->set_fov_post(fov);
- cam->set_use_perspective_motion(true);
+ cam->fov_post = fov;
+ cam->use_perspective_motion = true;
}
}
}
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp
index 1af592fc8ab..6288c370567 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -77,7 +77,7 @@ static bool ObtainCacheParticleData(
if ((b_part.render_type() == BL::ParticleSettings::render_type_PATH) &&
(b_part.type() == BL::ParticleSettings::type_HAIR)) {
- int shader = clamp(b_part.material() - 1, 0, hair->get_used_shaders().size() - 1);
+ int shader = clamp(b_part.material() - 1, 0, hair->used_shaders.size() - 1);
int display_step = background ? b_part.render_step() : b_part.display_step();
int totparts = b_psys.particles.length();
int totchild = background ? b_psys.child_particles.length() :
@@ -307,7 +307,7 @@ static void ExportCurveSegments(Scene *scene, Hair *hair, ParticleCurveData *CDa
VLOG(1) << "Exporting curve segments for mesh " << hair->name;
}
- hair->reserve_curves(hair->num_curves() + num_curves, hair->get_curve_keys().size() + num_keys);
+ hair->reserve_curves(hair->num_curves() + num_curves, hair->curve_keys.size() + num_keys);
num_keys = 0;
num_curves = 0;
@@ -350,7 +350,7 @@ static void ExportCurveSegments(Scene *scene, Hair *hair, ParticleCurveData *CDa
}
/* check allocation */
- if ((hair->get_curve_keys().size() != num_keys) || (hair->num_curves() != num_curves)) {
+ if ((hair->curve_keys.size() != num_keys) ||
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list