[Bf-blender-cvs] [e5081a0daea] blender2.8: Cleanup: Use full name for scene_layer in render

[Sergey Sharybin]

Commit: e5081a0daea9d2a052bd86a99534e5e62085b00e
Author: Sergey Sharybin
Date:   Thu Nov 9 15:22:57 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBe5081a0daea9d2a052bd86a99534e5e62085b00e

Cleanup: Use full name for scene_layer in render

===================================================================

M	source/blender/render/extern/include/RE_render_ext.h
M	source/blender/render/intern/source/pointdensity.c

===================================================================

diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h
index 82bb265e20c..aad4f511b65 100644
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
@@ -72,20 +72,20 @@ struct PointDensity;
 
 void RE_point_density_cache(
         struct Scene *scene,
-        struct SceneLayer *sl,
+        struct SceneLayer *scene_layer,
         struct PointDensity *pd,
         const bool use_render_params);
 
 void RE_point_density_minmax(
         struct Scene *scene,
-        struct SceneLayer *sl,
+        struct SceneLayer *scene_layer,
         struct PointDensity *pd,
         const bool use_render_params,
         float r_min[3], float r_max[3]);
 
 void RE_point_density_sample(
         struct Scene *scene,
-        struct SceneLayer *sl,
+        struct SceneLayer *scene_layer,
         struct PointDensity *pd,
         const int resolution,
         const bool use_render_params,
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index 4ba6e914c68..04786858b6b 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -966,7 +966,7 @@ void RE_point_density_cache(
 
 void RE_point_density_minmax(
         struct Scene *scene,
-        SceneLayer *sl,
+        SceneLayer *scene_layer,
         struct PointDensity *pd,
         const bool use_render_params,
         float r_min[3], float r_max[3])
@@ -997,7 +997,7 @@ void RE_point_density_minmax(
 		                                                           DAG_EVAL_VIEWPORT);
 
 		eval_ctx.ctime = (float)scene->r.cfra + scene->r.subframe;
-		eval_ctx.scene_layer = sl;
+		eval_ctx.scene_layer = scene_layer;
 
 		particle_system_minmax(&eval_ctx,
 		                       scene,
@@ -1070,7 +1070,7 @@ static void point_density_sample_func(void *data_v, const int iter)
  */
 void RE_point_density_sample(
         Scene *scene,
-        SceneLayer *sl,
+        SceneLayer *scene_layer,
         PointDensity *pd,
         const int resolution,
         const bool use_render_params,
@@ -1090,7 +1090,7 @@ void RE_point_density_sample(
 
 	BLI_mutex_lock(&sample_mutex);
 	RE_point_density_minmax(scene,
-	                        sl,
+	                        scene_layer,
 	                        pd,
 	                        use_render_params,
 	                        min,