This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Tamito Kajiyama 8135cc9f95 Merged changes in the trunk up to revision 47700. ...

Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h

2012-06-10 20:50:43 +00:00

..

bmesh

code cleanup: doxy comment filename corrections

2012-06-08 23:43:11 +00:00

generic

BGE patch #28476: Character object physics type

2012-05-28 21:36:29 +00:00

intern

Merged changes in the trunk up to revision 47700.

2012-06-10 20:50:43 +00:00

mathutils

Corrected documentation for intersect_point_quad_2d to match exactly how

2012-06-06 08:08:54 +00:00

BPY_extern.h

Python/context: python could get invalid bpy.data in scene update handler after

2012-05-08 22:07:06 +00:00

CMakeLists.txt

initial bmesh python api.

2012-02-22 09:19:53 +00:00

rna_dump.py

Code Cleanup: check is / is not when comparing singletons.

2012-02-02 21:07:56 +00:00

SConscript

Merged changes in the trunk up to revision 46557.

2012-05-11 22:48:41 +00:00

simple_enum_gen.py

style cleanup: py/capi

2012-03-16 21:39:56 +00:00