Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-10 01:25:53 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-10 01:27:07 +0300
commitba9992aa9182286404d94e651abdc91d5d7b36f7 (patch)
tree8e8122a5b3cbe3966afab6d955c42fb680d98ce1 /intern/cycles/blender/blender_shader.cpp
parentfb82cff7208fa5e612e54cf9fdb36859602e1ca0 (diff)
Cycles: Cleanp, avoid direct calls of RNA_enum_get, we've got utility for that
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
-rw-r--r--intern/cycles/blender/blender_shader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index a40eaf52480..c9a7f2756b7 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -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;