diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-24 17:48:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-24 17:48:10 +0300 |
| commit | faec4309147988fbab7b7d7ec661f5130358d169 (patch) | |
| tree | 0c839f8f88fe80f4a3762980adb5efe729ce1b44 /source/blender/makesrna/intern/rna_internal.h | |
| parent | f85745b17bfe68673bf5f799e98c617d9471ddf1 (diff) | |
| parent | e1dd83b399d46d81ea51f6c41725eec5c1a1db7a (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/blender_curves.cpp
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/transform/transform_snap_object.c
source/blender/editors/util/undo.c
source/blender/makesrna/intern/rna_object_force.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 6a993940513..5a3031d0514 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -196,6 +196,8 @@ void rna_def_animdata_common(struct StructRNA *srna); void rna_def_animviz_common(struct StructRNA *srna); void rna_def_motionpath_common(struct StructRNA *srna); +void rna_def_bone_curved_common(struct StructRNA *srna, bool is_posebone); + void rna_def_texmat_common(struct StructRNA *srna, const char *texspace_editable); void rna_def_mtex_common(struct BlenderRNA *brna, struct StructRNA *srna, const char *begin, const char *activeget, const char *activeset, const char *activeeditable, const char *structname, |