forked from bartvdbraak/blender
Cycles: Cleanp, avoid direct calls of RNA_enum_get, we've got utility for that
This commit is contained in:
parent
fb82cff720
commit
ba9992aa91
@ -158,8 +158,7 @@ static void blender_camera_from_object(BlenderCamera *bcam,
|
||||
break;
|
||||
}
|
||||
|
||||
switch(RNA_enum_get(&ccamera, "panorama_type"))
|
||||
{
|
||||
switch(get_enum(ccamera, "panorama_type")) {
|
||||
case 1:
|
||||
bcam->panorama_type = PANORAMA_FISHEYE_EQUIDISTANT;
|
||||
break;
|
||||
@ -188,7 +187,7 @@ static void blender_camera_from_object(BlenderCamera *bcam,
|
||||
|
||||
/* allow f/stop number to change aperture_size but still
|
||||
* give manual control over aperture radius */
|
||||
int aperture_type = RNA_enum_get(&ccamera, "aperture_type");
|
||||
int aperture_type = get_enum(ccamera, "aperture_type");
|
||||
|
||||
if(aperture_type == 1) {
|
||||
float fstop = RNA_float_get(&ccamera, "aperture_fstop");
|
||||
@ -461,7 +460,7 @@ void BlenderSync::sync_camera(BL::RenderSettings& b_render,
|
||||
curvemapping_to_array(b_shutter_curve, bcam.shutter_curve, RAMP_TABLE_SIZE);
|
||||
|
||||
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
|
||||
switch(RNA_enum_get(&cscene, "motion_blur_position")) {
|
||||
switch(get_enum(cscene, "motion_blur_position")) {
|
||||
case 0:
|
||||
bcam.motion_position = Camera::MOTION_POSITION_START;
|
||||
break;
|
||||
@ -476,7 +475,7 @@ void BlenderSync::sync_camera(BL::RenderSettings& b_render,
|
||||
break;
|
||||
}
|
||||
|
||||
switch(RNA_enum_get(&cscene, "rolling_shutter_type")) {
|
||||
switch(get_enum(cscene, "rolling_shutter_type")) {
|
||||
case 0:
|
||||
bcam.rolling_shutter_type = Camera::ROLLING_SHUTTER_NONE;
|
||||
break;
|
||||
|
@ -827,7 +827,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object& b_ob,
|
||||
|
||||
/* displacement method */
|
||||
if(cmesh.data) {
|
||||
const int method = RNA_enum_get(&cmesh, "displacement_method");
|
||||
const int method = get_enum(cmesh, "displacement_method");
|
||||
|
||||
if(method == 0 || !experimental)
|
||||
mesh->displacement_method = Mesh::DISPLACE_BUMP;
|
||||
|
@ -1204,8 +1204,8 @@ void BlenderSync::sync_materials(bool update_all)
|
||||
shader->use_mis = get_boolean(cmat, "sample_as_light");
|
||||
shader->use_transparent_shadow = get_boolean(cmat, "use_transparent_shadow");
|
||||
shader->heterogeneous_volume = !get_boolean(cmat, "homogeneous_volume");
|
||||
shader->volume_sampling_method = (VolumeSampling)RNA_enum_get(&cmat, "volume_sampling");
|
||||
shader->volume_interpolation_method = (VolumeInterpolation)RNA_enum_get(&cmat, "volume_interpolation");
|
||||
shader->volume_sampling_method = (VolumeSampling)get_enum(cmat, "volume_sampling");
|
||||
shader->volume_interpolation_method = (VolumeInterpolation)get_enum(cmat, "volume_interpolation");
|
||||
|
||||
shader->set_graph(graph);
|
||||
shader->tag_update(scene);
|
||||
@ -1235,8 +1235,8 @@ void BlenderSync::sync_world(bool update_all)
|
||||
/* volume */
|
||||
PointerRNA cworld = RNA_pointer_get(&b_world.ptr, "cycles");
|
||||
shader->heterogeneous_volume = !get_boolean(cworld, "homogeneous_volume");
|
||||
shader->volume_sampling_method = (VolumeSampling)RNA_enum_get(&cworld, "volume_sampling");
|
||||
shader->volume_interpolation_method = (VolumeInterpolation)RNA_enum_get(&cworld, "volume_interpolation");
|
||||
shader->volume_sampling_method = (VolumeSampling)get_enum(cworld, "volume_sampling");
|
||||
shader->volume_interpolation_method = (VolumeInterpolation)get_enum(cworld, "volume_interpolation");
|
||||
}
|
||||
else if(b_world) {
|
||||
ShaderNode *closure, *out;
|
||||
|
@ -192,7 +192,7 @@ void BlenderSync::sync_integrator()
|
||||
#endif
|
||||
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
|
||||
|
||||
experimental = (RNA_enum_get(&cscene, "feature_set") != 0);
|
||||
experimental = (get_enum(cscene, "feature_set") != 0);
|
||||
|
||||
Integrator *integrator = scene->integrator;
|
||||
Integrator previntegrator = *integrator;
|
||||
@ -220,7 +220,7 @@ void BlenderSync::sync_integrator()
|
||||
if(get_boolean(cscene, "use_animated_seed"))
|
||||
integrator->seed = hash_int_2d(b_scene.frame_current(), get_int(cscene, "seed"));
|
||||
|
||||
integrator->sampling_pattern = (SamplingPattern)RNA_enum_get(&cscene, "sampling_pattern");
|
||||
integrator->sampling_pattern = (SamplingPattern)get_enum(cscene, "sampling_pattern");
|
||||
|
||||
integrator->layer_flag = render_layer.layer;
|
||||
|
||||
@ -287,7 +287,7 @@ void BlenderSync::sync_film()
|
||||
film->use_sample_clamp = (integrator->sample_clamp_direct != 0.0f || integrator->sample_clamp_indirect != 0.0f);
|
||||
|
||||
film->exposure = get_float(cscene, "film_exposure");
|
||||
film->filter_type = (FilterType)RNA_enum_get(&cscene, "filter_type");
|
||||
film->filter_type = (FilterType)get_enum(cscene, "filter_type");
|
||||
film->filter_width = (film->filter_type == FILTER_BOX)? 1.0f: get_float(cscene, "filter_width");
|
||||
|
||||
if(b_scene.world()) {
|
||||
@ -348,7 +348,7 @@ void BlenderSync::sync_render_layers(BL::SpaceView3D& b_v3d, const char *layer)
|
||||
/* render layer */
|
||||
BL::RenderSettings r = b_scene.render();
|
||||
BL::RenderSettings::layers_iterator b_rlay;
|
||||
int use_layer_samples = RNA_enum_get(&cscene, "use_layer_samples");
|
||||
int use_layer_samples = get_enum(cscene, "use_layer_samples");
|
||||
bool first_layer = true;
|
||||
uint layer_override = get_layer(b_engine.layer_override());
|
||||
uint scene_layers = layer_override ? layer_override : get_layer(b_scene.layers());
|
||||
@ -440,7 +440,7 @@ SceneParams BlenderSync::get_scene_params(BL::Scene& b_scene,
|
||||
if(background)
|
||||
params.bvh_type = SceneParams::BVH_STATIC;
|
||||
else
|
||||
params.bvh_type = (SceneParams::BVHType)RNA_enum_get(&cscene, "debug_bvh_type");
|
||||
params.bvh_type = (SceneParams::BVHType)get_enum(cscene, "debug_bvh_type");
|
||||
|
||||
params.use_bvh_spatial_split = RNA_boolean_get(&cscene, "debug_use_spatial_splits");
|
||||
|
||||
@ -479,7 +479,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
|
||||
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
|
||||
|
||||
/* feature set */
|
||||
params.experimental = (RNA_enum_get(&cscene, "feature_set") != 0);
|
||||
params.experimental = (get_enum(cscene, "feature_set") != 0);
|
||||
|
||||
/* device type */
|
||||
vector<DeviceInfo>& devices = Device::available_devices();
|
||||
@ -487,13 +487,13 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
|
||||
/* device default CPU */
|
||||
params.device = devices[0];
|
||||
|
||||
if(RNA_enum_get(&cscene, "device") == 2) {
|
||||
if(get_enum(cscene, "device") == 2) {
|
||||
/* find network device */
|
||||
foreach(DeviceInfo& info, devices)
|
||||
if(info.type == DEVICE_NETWORK)
|
||||
params.device = info;
|
||||
}
|
||||
else if(RNA_enum_get(&cscene, "device") == 1) {
|
||||
else if(get_enum(cscene, "device") == 1) {
|
||||
/* find GPU device with given id */
|
||||
PointerRNA systemptr = b_userpref.system().ptr;
|
||||
PropertyRNA *deviceprop = RNA_struct_find_property(&systemptr, "compute_device");
|
||||
@ -564,7 +564,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
|
||||
}
|
||||
|
||||
if((BlenderSession::headless == false) && background) {
|
||||
params.tile_order = (TileOrder)RNA_enum_get(&cscene, "tile_order");
|
||||
params.tile_order = (TileOrder)get_enum(cscene, "tile_order");
|
||||
}
|
||||
else {
|
||||
params.tile_order = TILE_BOTTOM_TO_TOP;
|
||||
|
Loading…
Reference in New Issue
Block a user