[Bf-blender-cvs] [0b6ff084a9a] id_override_static: Merge branch 'blender2.8' into id_override_static

Bastien Montagne noreply at git.blender.org
Wed Nov 29 17:45:35 CET 2017


Commit: 0b6ff084a9a7860502dfc03c6283ca7e6424b92c
Author: Bastien Montagne
Date:   Wed Nov 29 15:09:22 2017 +0100
Branches: id_override_static
https://developer.blender.org/rB0b6ff084a9a7860502dfc03c6283ca7e6424b92c

Merge branch 'blender2.8' into id_override_static

Conflicts:
	source/blender/blenkernel/intern/library_override.c

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



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

diff --cc source/blender/blenkernel/intern/library_override.c
index be0bbaca416,bc69b085e57..22896cff64a
--- a/source/blender/blenkernel/intern/library_override.c
+++ b/source/blender/blenkernel/intern/library_override.c
@@@ -459,7 -459,8 +459,8 @@@ bool BKE_override_static_operations_cre
  		RNA_id_pointer_create(local, &rnaptr_local);
  		RNA_id_pointer_create(local->override_static->reference, &rnaptr_reference);
  
 -//		ret = RNA_struct_auto_override(&rnaptr_local, &rnaptr_reference, local->override_static, NULL);
 +		ret = RNA_struct_auto_override(&rnaptr_local, &rnaptr_reference, local->override_static, NULL);
+ #ifndef NDEBUG
  		if (ret) {
  			printf("We did generate static override rules for %s\n", local->name);
  		}



More information about the Bf-blender-cvs mailing list