diff options
-rw-r--r-- | intern/cycles/kernel/shaders/node_wave_texture.osl | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 7 |
2 files changed, 7 insertions, 4 deletions
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'; } |