diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
-rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 0dcfc773d19..3f2bb60fba1 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -204,8 +204,9 @@ void rna_object_vcollayer_name_set(struct PointerRNA *ptr, const char *value, ch PointerRNA rna_object_shapekey_index_get(struct ID *id, int value); int rna_object_shapekey_index_set(struct ID *id, PointerRNA value, int current); -void rna_Object_update(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); -void rna_Object_update_data(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); +/* named internal so as not to conflict with obj.update() rna func */ +void rna_Object_internal_update(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); +void rna_Object_internal_update_data(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); void rna_Mesh_update_draw(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); void rna_TextureSlot_update(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); |