diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-09 17:32:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-09 17:45:21 +0300 |
| commit | 2466afd089ee370c7b6ccb288fc38fdcc6152805 (patch) | |
| tree | 0aec2de6c9023f38ea055a16f63ac18b223e4bba /source/blender/makesrna/intern/rna_nodetree.c | |
| parent | 859417c65796a48599eb073bcfe03f2382110f38 (diff) | |
Cleanup: Use full name for scene_layer in makesrna
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 5db2d534dbe..9ad222d6b7a 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -3129,7 +3129,7 @@ static int point_density_vertex_color_source_from_shader(NodeShaderTexPointDensi void rna_ShaderNodePointDensity_density_cache(bNode *self, Scene *scene, - SceneLayer *sl, + SceneLayer *scene_layer, int settings) { NodeShaderTexPointDensity *shader_point_density = self->storage; @@ -3167,13 +3167,13 @@ void rna_ShaderNodePointDensity_density_cache(bNode *self, /* Single-threaded sampling of the voxel domain. */ RE_point_density_cache(scene, - sl, pd, + scene_layer, pd, settings == 1); } void rna_ShaderNodePointDensity_density_calc(bNode *self, Scene *scene, - SceneLayer *sl, + SceneLayer *scene_layer, int settings, int *length, float **values) @@ -3195,7 +3195,7 @@ void rna_ShaderNodePointDensity_density_calc(bNode *self, } /* Single-threaded sampling of the voxel domain. */ - RE_point_density_sample(scene, sl, pd, + RE_point_density_sample(scene, scene_layer, pd, resolution, settings == 1, *values); @@ -3208,7 +3208,7 @@ void rna_ShaderNodePointDensity_density_calc(bNode *self, void rna_ShaderNodePointDensity_density_minmax(bNode *self, Scene *scene, - SceneLayer *sl, + SceneLayer *scene_layer, int settings, float r_min[3], float r_max[3]) @@ -3220,7 +3220,7 @@ void rna_ShaderNodePointDensity_density_minmax(bNode *self, zero_v3(r_max); return; } - RE_point_density_minmax(scene, sl, pd, settings == 1, r_min, r_max); + RE_point_density_minmax(scene, scene_layer, pd, settings == 1, r_min, r_max); } #else @@ -4204,13 +4204,13 @@ static void def_sh_tex_pointdensity(StructRNA *srna) func = RNA_def_function(srna, "cache_point_density", "rna_ShaderNodePointDensity_density_cache"); RNA_def_function_ui_description(func, "Cache point density data for later calculation"); RNA_def_pointer(func, "scene", "Scene", "", ""); - RNA_def_pointer(func, "sl", "SceneLayer", "", ""); + RNA_def_pointer(func, "scene_layer", "SceneLayer", "", ""); RNA_def_enum(func, "settings", calc_mode_items, 1, "", "Calculate density for rendering"); func = RNA_def_function(srna, "calc_point_density", "rna_ShaderNodePointDensity_density_calc"); RNA_def_function_ui_description(func, "Calculate point density"); RNA_def_pointer(func, "scene", "Scene", "", ""); - RNA_def_pointer(func, "sl", "SceneLayer", "", ""); + RNA_def_pointer(func, "scene_layer", "SceneLayer", "", ""); RNA_def_enum(func, "settings", calc_mode_items, 1, "", "Calculate density for rendering"); /* TODO, See how array size of 0 works, this shouldnt be used. */ parm = RNA_def_float_array(func, "rgba_values", 1, NULL, 0, 0, "", "RGBA Values", 0, 0); @@ -4220,7 +4220,7 @@ static void def_sh_tex_pointdensity(StructRNA *srna) func = RNA_def_function(srna, "calc_point_density_minmax", "rna_ShaderNodePointDensity_density_minmax"); RNA_def_function_ui_description(func, "Calculate point density"); RNA_def_pointer(func, "scene", "Scene", "", ""); - RNA_def_pointer(func, "sl", "SceneLayer", "", ""); + RNA_def_pointer(func, "scene_layer", "SceneLayer", "", ""); RNA_def_enum(func, "settings", calc_mode_items, 1, "", "Calculate density for rendering"); parm = RNA_def_property(func, "min", PROP_FLOAT, PROP_COORDS); RNA_def_property_array(parm, 3); |