griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,703 Commits 1 Branch 0 Tags
40e3dfd3bd1ff22d293df1d9d7b1b9b90d9bd708
Commit Graph

43 Commits

Author SHA1 Message Date
Tamito Kajiyama
b6a9a953bc Merged changes in the trunk up to revision 47056. 
Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c
 2012-05-26 22:22:45 +00:00
Campbell Barton
3289628610 fix [#31489] EdgeSplit modifier prevents All Edge to be work correctly since 2.63 
bmesh regression where the edge-draw flag was cleared when bmesh modifiers were used.
 2012-05-22 07:26:45 +00:00
Tamito Kajiyama
8925ed1420 Merged changes in the trunk up to revision 46557. 
Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c

Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().
 2012-05-11 22:48:41 +00:00
Campbell Barton
3d9d26d6bf fix [#31197] Limited dissolve leaves faces/edges/verts behind 
bad bug where vertices could be in a face more then once (which isn't allowed), now check for this when creating a face.
 2012-05-06 18:04:37 +00:00
Tamito Kajiyama
bb1f8d9586 Merged changes in the trunk up to revision 46309. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
 2012-05-05 11:40:42 +00:00
Campbell Barton
2a1ba8c85b style cleanup: formatting and some float/double promotion 2012-05-03 19:57:24 +00:00
Tamito Kajiyama
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
Campbell Barton
ef054e165c style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros. 2012-04-28 15:14:16 +00:00
Campbell Barton
47b6b60e5a code cleanup: no functional change - had both EDBM_editselection_* and BM_editselection_* funcs, replace EDBM_ funcs. 2012-04-24 21:19:18 +00:00
Tamito Kajiyama
cdbfd1db38 Merged changes in the trunk up to revision 45820. 
Conflicts resolved:
source/creator/creator.c
 2012-04-21 00:33:36 +00:00
Campbell Barton
475ecbb0ce remove BM_ITER, BM_ITER_INDEX macros, use ELEM or MESH variants only (the maceros had unused args in both cases). 2012-04-19 13:47:58 +00:00
Campbell Barton
75b869e428 style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER 2012-04-19 11:44:12 +00:00
Tamito Kajiyama
4a19ccfa5f Merged changes in the trunk up to revision 45619. 2012-04-14 10:38:11 +00:00
Campbell Barton
a1e6e75add fix [#30936] Face Inset gives bad UV's 2012-04-13 10:37:33 +00:00
Campbell Barton
8fa17c5362 code cleanup: no functional changes 
- memset(..., -1) is used incorrectly even though it worked: MOD_solidify.c - thanks Halley from IRC for noticing this. use fill_vn_i() instead.
- quiet warnings in editmesh_slide.c
- cleanup comments in bmesh and some other minor comment additions.
 2012-04-07 12:37:15 +00:00
Tamito Kajiyama
79e2cd8fdf Merged changes in the trunk up to revision 45383. 2012-04-04 00:50:41 +00:00
Campbell Barton
3f3b88ff42 bmesh iterators were passing the BMesh as data argument to BM_iter_new(), harmless but incorrect. 
replace these cases with iterator macro.
 2012-04-03 00:28:38 +00:00
Tamito Kajiyama
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
Campbell Barton
7044d80639 code cleanup: remove BMesh * args from query functions which don't need it 2012-03-22 07:53:11 +00:00
Campbell Barton
d76c05cd36 style cleanup: bmesh 2012-03-21 09:10:08 +00:00
Campbell Barton
4f19c1a995 spelling cleanup 2012-03-18 07:38:51 +00:00
Campbell Barton
ea79c470d2 bmesh: Fkey now creates faces from 5 or more disconnected vertices. 
Added function: BM_face_create_ngon_vcloud
creating quads and tris use this too since it finds the best face winding direction based on surrounding face (if any)
 2012-03-14 22:57:15 +00:00
Campbell Barton
b330abc290 remove Object member from BMesh struct - was only used for undo and BMEditMesh already stores an object pointer. 
also fix for own mistake with mesh conversion refactor, shape key index was off by 1 when switching editmode.
 2012-03-11 19:58:56 +00:00
Tamito Kajiyama
a2ebfc82db Merged changes in the trunk up to revision 44797. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
 2012-03-10 21:56:23 +00:00
Campbell Barton
4f7bdc59d3 style cleanup: spelling. 
also remove large, duplicate comments from sunsky.h
 2012-03-09 00:41:09 +00:00
Campbell Barton
17786b3b3e building without python works again, cleanup bmesh include paths (cmake and scons). 2012-03-08 03:25:53 +00:00
Tamito Kajiyama
9e93fc1e8a Merged changes in the trunk up to revision 44612. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
 2012-03-03 01:43:44 +00:00
Campbell Barton
921a7556fb bmesh - changes to mempool allocations 
* double default edge allocation size (double the number of verts/faces).
* CustomData_bmesh_init_pool was using allocsize & chunksize as the same variable. Now use type specific chunk size.
* bmesh copy and editmode conversion now allocate the BMesh mempool size needed for the entire vert/edge/loop/face arrays since its known already.
 2012-03-01 22:17:04 +00:00
Campbell Barton
9aafe32147 bmmesh api - use struct rather than int[4] to initialize mesh sizes. 
also correct bad assert() in previous commit.
 2012-03-01 20:09:17 +00:00
Tamito Kajiyama
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
Campbell Barton
a6f420b828 update doxygen comments for bmesh. 2012-02-29 06:55:10 +00:00
Campbell Barton
dcfd1dd7e2 code cleanup: de-duplicate bmesh face creation code, 2012-02-28 19:30:44 +00:00
Campbell Barton
2a7f1af61e Code Cleanup: 
- apply some rules for function naming conventions, added to main bmesh doc in bmesh.h.
- remove unused function BM_loops_to_corners().
 2012-02-28 19:10:53 +00:00
Campbell Barton
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
Campbell Barton
e828b10251 Code Cleanup 
* remove one the changes to fix #30374, instead just check if the face exists.
* remove some unneeded edge checks in BM_face_create_quad_tri_v().
 2012-02-28 08:17:53 +00:00
Campbell Barton
7536bcbe70 Code Cleanup: bmesh 
* remove unneeded struct's from headers.
* give argument names for return ** pointers r_ prefix.
 2012-02-28 07:42:48 +00:00
Campbell Barton
94f171f2c6 fix [#30374] Can't Fill Triangular Face 
the problem was a triangle couldnt be made when there was a quad that used 3 of the verts.

* now check if overlapping face has same length as the one to be created.
* an unrelated fix - the output of a triangle was not being flagged by the bmesh_contextual_create operator.
 2012-02-28 07:19:28 +00:00
Campbell Barton
4c3e3e93a9 bmesh minor api edits to be a little more typesafe. 2012-02-27 14:57:09 +00:00
Campbell Barton
e17bf02c2d Code Cleanup: 
* made bmesh_structure.h function names more consistant.
* remove unused code in bmesh_structure.c
* removed 'Edge Flip' operator (missing from bmesh but looked into trunk feature and dont think its worth keeping).
* tagged  some BMESH_TODO's
 2012-02-27 13:47:53 +00:00
Campbell Barton
c65b3b73fd bmesh api cleanup 
* better type safety for BM_elem_flag_* and BM_elem_index_* functions.
* add BMElem type to be used where BMFace/Edge/Vert/Loop can be interchanged.
* fix bug in select manifold, found when making functions more strict.
 2012-02-25 22:23:40 +00:00
Campbell Barton
98aececc8e bmesh code cleanup 
* change BMO_elem_flag_* defines to inline functions.
* BMO_slot_map_insert() is too big for an inline function - un-inline it.
* remove redundant casts.
 2012-02-25 20:58:03 +00:00
Tamito Kajiyama
69289c978e Merged changes in the trunk up to revision 44266 (including BMesh). 
Freestyle edge/face marks were ported to BMesh.

Conflicts resolved:
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/blenkernel/intern/editderivedmesh.c
 2012-02-21 01:40:04 +00:00
Campbell Barton
afc56a0b10 copying bmesh dir on its own from bmesh branch 2012-02-19 18:31:04 +00:00