diff options
| author | Nathan Letwory <nathan@mcneel.com> | 2014-05-19 14:49:36 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@mcneel.com> | 2014-05-19 15:46:58 +0400 |
| commit | 0684ac93013681261e8acc5ac6296c5de785d7d8 (patch) | |
| tree | a0c44d4b6ba118bd56755fae76705ca7e7145123 /intern/cycles/blender/blender_sync.cpp | |
| parent | 9a7c4ead3f57052c911570d1b507e1f5229210c8 (diff) | |
Move ShadingSystem enum to shader.h
Add SHADINGSYSTEM_ to enum member names, so it is clear where they
are from.
Revert BVHType enum changes, as there's no need for code dedup here.
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index d0eac1619f9..bdb3e20632f 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -35,7 +35,6 @@ #include "util_debug.h" #include "util_foreach.h" #include "util_opengl.h" -#include "util_types.h" CCL_NAMESPACE_BEGIN @@ -363,19 +362,19 @@ SceneParams BlenderSync::get_scene_params(BL::Scene b_scene, bool background) const bool shadingsystem = RNA_boolean_get(&cscene, "shading_system"); if(shadingsystem == 0) - params.shadingsystem = ShadingSystem::SVM; + params.shadingsystem = SHADINGSYSTEM_SVM; else if(shadingsystem == 1) - params.shadingsystem = ShadingSystem::OSL; + params.shadingsystem = SHADINGSYSTEM_OSL; if(background) - params.bvh_type = BVHType::BVH_STATIC; + params.bvh_type = SceneParams::BVH_STATIC; else - params.bvh_type = (BVHType)RNA_enum_get(&cscene, "debug_bvh_type"); + params.bvh_type = (SceneParams::BVHType)RNA_enum_get(&cscene, "debug_bvh_type"); params.use_bvh_spatial_split = RNA_boolean_get(&cscene, "debug_use_spatial_splits"); params.use_bvh_cache = (background)? RNA_boolean_get(&cscene, "use_cache"): false; - if(background && params.shadingsystem != ShadingSystem::OSL) + if(background && params.shadingsystem != SHADINGSYSTEM_OSL) params.persistent_data = r.use_persistent_data(); else params.persistent_data = false; @@ -512,9 +511,9 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use const bool shadingsystem = RNA_boolean_get(&cscene, "shading_system"); if(shadingsystem == 0) - params.shadingsystem = ShadingSystem::SVM; + params.shadingsystem = SHADINGSYSTEM_SVM; else if(shadingsystem == 1) - params.shadingsystem = ShadingSystem::OSL; + params.shadingsystem = SHADINGSYSTEM_OSL; /* color managagement */ params.display_buffer_linear = GLEW_ARB_half_float_pixel && b_engine.support_display_space_shader(b_scene); |