[Bf-blender-cvs] [f6c1762bb39] blender2.8: Fix previous commit, sorry about that :/

Bastien Montagne noreply at git.blender.org
Tue May 1 17:03:46 CEST 2018


Commit: f6c1762bb3997250fc59c0c3286ee63fe07f1826
Author: Bastien Montagne
Date:   Tue May 1 17:03:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf6c1762bb3997250fc59c0c3286ee63fe07f1826

Fix previous commit, sorry about that :/

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

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 3c28cdb3364..d70309dadb8 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -7684,7 +7684,7 @@ bool RNA_struct_override_store(
 static void rna_property_override_apply_ex(
         PointerRNA *ptr_local, PointerRNA *ptr_override, PointerRNA *ptr_storage,
         PropertyRNA *prop_local, PropertyRNA *prop_override, PropertyRNA *prop_storage,
-        IDOverrideStaticProperty *op, const bool do_insert)
+        IDOverrideStaticProperty *op)
 {
 	for (IDOverrideStaticPropertyOperation *opop = op->operations.first; opop; opop = opop->next) {
 		if (!rna_property_override_operation_apply(ptr_local, ptr_override, ptr_storage,
@@ -7721,7 +7721,7 @@ void RNA_struct_override_apply(
 
 			rna_property_override_apply_ex(
 			            &data_local, &data_override, prop_storage ? &data_storage : NULL,
-			            prop_local, prop_override, prop_storage, op, do_insert);
+			            prop_local, prop_override, prop_storage, op);
 		}
 #ifndef NDEBUG
 		else {



More information about the Bf-blender-cvs mailing list