[Bf-blender-cvs] [666a3b6161a] temp-dynamic-overrides: Fix warning + cleanup

Dalai Felinto noreply at git.blender.org
Wed May 16 15:26:39 CEST 2018


Commit: 666a3b6161af0a0adbd3cf7fbbde9aafa25909d2
Author: Dalai Felinto
Date:   Wed May 16 15:26:21 2018 +0200
Branches: temp-dynamic-overrides
https://developer.blender.org/rB666a3b6161af0a0adbd3cf7fbbde9aafa25909d2

Fix warning + cleanup

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

M	source/blender/blenkernel/intern/layer.c
M	source/blender/makesrna/intern/rna_dynamic_override.c

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 90116c15b3c..8f179f5f395 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -2020,9 +2020,9 @@ DynamicOverrideProperty *BKE_view_layer_override_property_add(
 	dyn_prop->id_type = id_type;
 	dyn_prop->property_type = property_type;
 	dyn_prop->rna_path = rna_path_str;
+	dyn_prop->array_len = RNA_property_array_length(ptr, prop);
 
 	const bool is_array = RNA_property_array_check(prop);
-	dyn_prop->array_len = RNA_property_array_length(ptr, prop);
 
 	/* TODO handle array. */
 	switch (RNA_property_type(prop)) {
diff --git a/source/blender/makesrna/intern/rna_dynamic_override.c b/source/blender/makesrna/intern/rna_dynamic_override.c
index 275e833864c..40732862c17 100644
--- a/source/blender/makesrna/intern/rna_dynamic_override.c
+++ b/source/blender/makesrna/intern/rna_dynamic_override.c
@@ -159,7 +159,7 @@ static void rna_DynamicOverrideProperty_value_float_range(
 	*max = FLT_MAX;
 }
 
-static int rna_DynamicOverrideProperty_value_color_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])
+static int rna_DynamicOverrideProperty_value_color_get_length(PointerRNA *ptr, int UNUSED(length)[RNA_MAX_ARRAY_DIMENSION])
 {
 	DynamicOverrideProperty *dyn_prop = ptr->data;
 	return dyn_prop->array_len;



More information about the Bf-blender-cvs mailing list