forked from bartvdbraak/blender
80e398e7b2
Conflicts resolved: doc/python_api/sphinx_doc_gen.py source/blender/blenkernel/BKE_main.h source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/editors/include/UI_resources.h source/blender/editors/interface/resources.c source/blender/makesdna/DNA_ID.h source/blender/makesdna/intern/makesdna.c source/blender/makesrna/intern/rna_internal.h source/blender/makesrna/intern/rna_main.c source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_scene.c |
||
---|---|---|
.. | ||
__init__.py | ||
add_mesh_torus.py | ||
anim.py | ||
clip.py | ||
console.py | ||
freestyle.py | ||
image.py | ||
mesh.py | ||
object_align.py | ||
object_quick_effects.py | ||
object_randomize_transform.py | ||
object.py | ||
presets.py | ||
screen_play_rendered_anim.py | ||
sequencer.py | ||
uvcalc_follow_active.py | ||
uvcalc_lightmap.py | ||
uvcalc_smart_project.py | ||
vertexpaint_dirt.py | ||
view3d.py | ||
wm.py |