[Bf-blender-cvs] [a450bf330c2] master: Cleanup: compiler warnings

[Brecht Van Lommel]

Commit: a450bf330c22264d87b0476f94e67a325c26d615
Author: Brecht Van Lommel
Date:   Tue Feb 18 00:22:49 2020 +0100
Branches: master
https://developer.blender.org/rBa450bf330c22264d87b0476f94e67a325c26d615

Cleanup: compiler warnings

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

M	intern/cycles/kernel/shaders/node_wave_texture.osl
M	source/blender/makesrna/intern/rna_object_api.c

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

diff --git a/intern/cycles/kernel/shaders/node_wave_texture.osl b/intern/cycles/kernel/shaders/node_wave_texture.osl
index 5f97976e582..5cc77aac75a 100644
--- a/intern/cycles/kernel/shaders/node_wave_texture.osl
+++ b/intern/cycles/kernel/shaders/node_wave_texture.osl
@@ -19,7 +19,7 @@
 
 /* Wave */
 
-float wave(point p,
+float wave(point p_input,
            string type,
            string bands_direction,
            string rings_direction,
@@ -30,7 +30,7 @@ float wave(point p,
            float phase)
 {
   /* Prevent precision issues on unit coordinates. */
-  p = (p + 0.000001) * 0.999999;
+  point p = (p_input + 0.000001) * 0.999999;
 
   float n = 0.0;
 
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 2acfd62fd03..5552de00be8 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -688,8 +688,11 @@ void rna_Object_me_eval_info(
   }
 }
 #  else
-void rna_Object_me_eval_info(
-    struct Object *ob, bContext *C, int type, PointerRNA *rnaptr_depsgraph, char *result)
+void rna_Object_me_eval_info(struct Object *UNUSED(ob),
+                             bContext *UNUSED(C),
+                             int UNUSED(type),
+                             PointerRNA *UNUSED(rnaptr_depsgraph),
+                             char *result)
 {
   result[0] = '\0';
 }