|
|
2585d52405
|
Merged changes in the trunk up to revision 46045.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
|
2012-04-29 00:59:04 +00:00 |
|
|
|
8baa5fbde2
|
- fix for python freeing its own bmesh clearing the global mirror cache.
- fix for own mistake (Ctrl+T didnt set beauty peroperty).
- remove bad level includes in bmesh.
|
2012-04-23 04:24:11 +00:00 |
|
|
|
b51590d55d
|
code cleanup: bmesh subdivide code - BM_mesh_esubdivideflag() & "esubd" bmesh operator was passing a flag about in a fairly confusing way.
since we will eventually have python bmesh operator access better expose this as multiple booleans.
remove remaining editbutflag's
|
2012-04-23 03:43:02 +00:00 |
|
|
|
3b711a6ed0
|
Merged changes in the trunk up to revision 45133.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
|
2012-03-25 08:20:19 +00:00 |
|
|
|
3c11379e26
|
code cleanup: move bmesh inline funcs to headers (avoids compiling the C files).
|
2012-03-24 01:24:58 +00:00 |
|
|
|
35708fe150
|
Merged changes in the trunk up to revision 44561.
Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c
|
2012-02-29 21:35:49 +00:00 |
|
|
|
d1d11bbe9b
|
more header re-arranging.
Some function comments were in headers, some in the C files, some in both.
Moved function comments from headers into the C files.
|
2012-02-28 18:28:30 +00:00 |
|
|
|
df0f0c63d3
|
bmesh: re-arrange headers
|
2012-02-28 16:47:12 +00:00 |
|
