[Bf-blender-cvs] [da6a2def64] id_override_static: Fix bug in new copy/applyoverride code of RNA property.

[Bastien Montagne]

Commit: da6a2def64bb776efa4c2a2853119e6a35c5c855
Author: Bastien Montagne
Date:   Fri Mar 24 12:43:39 2017 +0100
Branches: id_override_static
https://developer.blender.org/rBda6a2def64bb776efa4c2a2853119e6a35c5c855

Fix bug in new copy/applyoverride code of RNA property.

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

M	source/blender/makesrna/intern/rna_access.c

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

diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index a1a25cf5c3..066b6853c5 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -7345,7 +7345,7 @@ static bool rna_property_override_operation_apply(
 					if (array_a != fixed_a) MEM_freeN(array_a);
 				}
 				else {
-					const int storage_value = storageprop ? RNA_property_int_get_index(storage, storageprop, index) : 0;
+					const int storage_value = storage ? RNA_property_int_get_index(storage, storageprop, index) : 0;
 
 					switch (override_op) {
 						case IDOVERRIDE_REPLACE:
@@ -7367,7 +7367,7 @@ static bool rna_property_override_operation_apply(
 				}
 			}
 			else {
-				const int storage_value = storageprop ? RNA_property_int_get(storage, storageprop) : 0;
+				const int storage_value = storage ? RNA_property_int_get(storage, storageprop) : 0;
 
 				switch (override_op) {
 					case IDOVERRIDE_REPLACE:
@@ -7424,7 +7424,7 @@ static bool rna_property_override_operation_apply(
 					if (array_a != fixed_a) MEM_freeN(array_a);
 				}
 				else {
-					const float storage_value = storageprop ? RNA_property_float_get_index(storage, storageprop, index) : 0.0f;
+					const float storage_value = storage ? RNA_property_float_get_index(storage, storageprop, index) : 0.0f;
 
 					switch (override_op) {
 						case IDOVERRIDE_REPLACE:
@@ -7450,7 +7450,7 @@ static bool rna_property_override_operation_apply(
 				}
 			}
 			else {
-				const float storage_value = storageprop ? RNA_property_float_get(storage, storageprop) : 0.0f;
+				const float storage_value = storage ? RNA_property_float_get(storage, storageprop) : 0.0f;
 
 				switch (override_op) {
 					case IDOVERRIDE_REPLACE: