[Bf-blender-cvs] [4ee4eed9e97] id_override_static: Merge branch 'blender2.8' into id_override_static
Bastien Montagne
noreply at git.blender.org
Thu Nov 23 23:37:35 CET 2017
Commit: 4ee4eed9e97b9ed08a9e445fc704b7b6b6415956
Author: Bastien Montagne
Date: Thu Nov 23 22:18:46 2017 +0100
Branches: id_override_static
https://developer.blender.org/rB4ee4eed9e97b9ed08a9e445fc704b7b6b6415956
Merge branch 'blender2.8' into id_override_static
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_internal.h
index c56bb27bd9d,23a34918d33..4a41105134f
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@@ -35,10 -35,8 +35,11 @@@
#define RNA_MAGIC ((int)~0)
+ struct FreestyleSettings;
struct ID;
+struct IDOverride;
+struct IDOverrideProperty;
+struct IDOverridePropertyOperation;
struct IDProperty;
struct Main;
struct Mesh;
More information about the Bf-blender-cvs
mailing list