griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
38,042 Commits 1 Branch 0 Tags
5f02b167d191969474c8f3575abdd6dbaeffeb57
Commit Graph

307 Commits

Author SHA1 Message Date
Tamito Kajiyama
4c8febf3ea Merged changes in the trunk up to revision 45431. 2012-04-06 03:37:27 +00:00
Miika Hamalainen
329c665c16 Fix blenderplayer compile. 2012-04-04 10:55:55 +00:00
Tamito Kajiyama
4c36a26af5 Merged changes in the trunk up to revision 45308. 
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
 2012-03-31 22:09:43 +00:00
Antony Riakiotakis
08e56a26ad Add stub for ED_mesh_calc_tessface to get blenderplayer compiling again. 2012-03-29 17:17:39 +00:00
Campbell Barton
42076f0a1f skip using bmesh operators for converting to/from undo meshes (gives some speedup) 2012-03-29 01:41:56 +00:00
Campbell Barton
09f29c0b70 style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions 2012-03-27 04:46:52 +00:00
Brecht Van Lommel
862a1a6afa Fix blenderplayer build, adding stub. 2012-03-26 12:45:28 +00:00
Campbell Barton
c9c66720c8 disallow adding tessfaces to a mesh with polygons (only allowed case is creating a new mesh with tessfaces and later converting to polygons, which wont work if polygons exist) 2012-03-26 04:32:04 +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
Antony Riakiotakis
b06f238bb0 Fix blenderplayer utf8 cmake for MinGW (linking order matters for gcc) 2012-03-21 12:35:39 +00:00
Alexander Kuznetsov
c2531e47b6 Fix for compiling bplayer on cmake/win after adding utf support. 
Reported by Miika
 2012-03-20 23:10:46 +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
Sergey Sharybin
03ebd2091b Add stub needed for blenderplayer compilation. 2012-03-05 17:23:52 +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
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
47c373c7a9 style cleanup (mostly whitespace) 2012-02-27 10:35:39 +00:00
Tamito Kajiyama
9ca7f6659f Merged changes in the trunk up to revision 44419. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
 2012-02-25 01:26:45 +00:00
Antony Riakiotakis
bb5e545bf4 Fix blenderplayer linking with recent additions to bmesh python. We should really start building with player on so that mistakes like this can be detected early. 2012-02-22 18:57:17 +00:00
Tamito Kajiyama
9f243d531c Merged changes in the trunk up to revision 44288. 
Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c
 2012-02-21 02:19:54 +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
Miika Hamalainen
a921d9d22b Fixed blenderplayer compile for msvc. 2012-02-20 08:06:24 +00:00
Tamito Kajiyama
910f04ca63 Merged changes in the trunk up to revision 44221. 
Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
 2012-02-18 11:26:11 +00:00
Campbell Barton
379527581b svn merge ^/trunk/blender -r44204:44213 2012-02-17 21:07:18 +00:00
Sergey Sharybin
c628f04a7c - Fixed linking errors of blender player with CMake and XDND enabled 
- Rest of changes to make XDND switch-off-able: link against extern_xdnd only
  if XDND is enabled
 2012-02-17 20:59:21 +00:00
Tamito Kajiyama
68ae82bb47 Merged changes in the trunk up to revision 43585. 
Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
 2012-01-21 23:01:25 +00:00
Campbell Barton
c8037fb56a svn merge ^/trunk/blender -r43530:43554 2012-01-20 12:34:00 +00:00
Andrew Hale
8817aaef3e - Fix for commit 43551 which caused a linking error in blenderplayer. 
- Minor clean up for commit 43551.
 2012-01-20 05:11:42 +00:00
Campbell Barton
0f28c1c27a svn merge ^/trunk/blender -r43461:43472 2012-01-17 21:08:25 +00:00
Antony Riakiotakis
a8081c1d2b Uv Tools branch GSOC 2011 
=========================
Documentation: http://wiki.blender.org/index.php/User:Psy-Fi/UV_Tools

Major features include:

*16 bit image support in viewport
*Subsurf aware unwrapping
*Smart Stitch(snap/rotate islands, preview, middlepoint/endpoint stitching)
*Seams from islands tool (marks seams and sharp, depending on settings)
*Uv Sculpting(Grab/Pinch/Rotate)

All tools are complete apart from stitching that is considered stable but with an extra edge mode under development(will be in soc-2011-onion-uv-tools).
 2012-01-17 16:31:13 +00:00
Campbell Barton
bbe69705a5 svn merge ^/trunk/blender -r43420:43436 2012-01-17 02:20:23 +00:00
Sergey Sharybin
f075f2babb Corrected fix for linking issues with blenderplayer enabled 2012-01-16 18:49:10 +00:00
Sergey Sharybin
de50e6324a Fix for compilation error using cmake+msvc 2012-01-16 18:24:30 +00:00
Tamito Kajiyama
e0df491d1e Merged changes in the trunk up to revision 43404. 
Conflicts resolved:
source/blender/python/SConscript
 2012-01-15 23:13:12 +00:00
Campbell Barton
a7b0a11811 svn merge ^/trunk/blender -r43278:43294 2012-01-11 15:04:54 +00:00
Campbell Barton
b308e61312 svn merge ^/trunk/blender -r43220:43278 --accept postpone 2012-01-11 14:14:04 +00:00
Campbell Barton
535d27eb49 minor cleanup for string use - no functional changes 
- use more logical names for strings, noticed too many strings called `str` when reviewing name patch.
- pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
 2012-01-11 09:33:44 +00:00
Brecht Van Lommel
d7932ceea8 Cycles: multi GPU rendering support. 
The rendering device is now set in User Preferences > System, where you can
choose between OpenCL/CUDA and devices. Per scene you can then still choose
to use CPU or GPU rendering.

Load balancing still needs to be improved, now it just splits the entire
render in two, that will be done in a separate commit.
 2012-01-09 16:58:01 +00:00
Tamito Kajiyama
cc3adc2202 Merged changes in the trunk up to revision 43038. 
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
 2011-12-31 21:09:26 +00:00
Andrew Wiggin
85242e9f6c Fix blenderplayer build (by adding missing bad level call stubs) 2011-12-31 17:46:42 +00:00
Campbell Barton
78a4e24614 svn merge ^/trunk/blender -r43009:43033 2011-12-31 12:03:36 +00:00
Nicholas Bishop
289c8b5758 Add remesh modifier (dual contouring). 
This patch adds a new remeshing modifier. The algorithm is based on
the paper "Dual Contouring of Hermite Data", and the implementation
was contributed to Blender by Dr. Tao Ju.

The contributed code is in intern/dualcon, and was modified to compile
under gcc and work on 64-bit systems. Files not needed for Blender
were removed and a small C wrapper was added in order to interface it
with Blender. The rest of the patch is just standard modifier stuff.

Reviewed by Sergey, code review link:
http://codereview.appspot.com/5491053/

The remesh icon was contributed by Zafio:
http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2.
Thanks to everyone in that thread for the icon proposals and
discussion.

Documentation and examples on the Blender wiki:
http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier

In case the history is needed for anything, check the remesh-modifier
branch of this git repository:
https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
 2011-12-30 21:11:40 +00:00
Tamito Kajiyama
3197796cf7 Merged changes in the trunk up to revision 42425. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
 2011-12-05 02:12:49 +00:00
Andrew Wiggin
ce64872913 Add stubs for bad level calls found when doing a release build (including more features) while working on the last commit 2011-12-01 18:36:36 +00:00
Campbell Barton
063dd4f60a svn merge ^/trunk/blender -r42197:42221 2011-11-28 17:09:13 +00:00
Antony Riakiotakis
911be02fcd remove duplicate extern_colamd from blenderplayer cmake 2011-11-28 08:38:08 +00:00
Tamito Kajiyama
b6569ee4e7 Merged changes in the trunk up to revision 42116. 2011-11-26 13:11:55 +00:00
Campbell Barton
74c6c91ba6 svn merge ^/trunk/blender -r42080:42095 2011-11-23 17:14:27 +00:00
Sergey Sharybin
a91bd43d38 Fix compilation error of blenderplayer caused by recent commit. 2011-11-23 16:44:33 +00:00
Campbell Barton
f9e00b5c99 svn merge ^/trunk/blender -r42009:42053 2011-11-22 11:51:42 +00:00
Dalai Felinto
7d124edead fix for blenderplayer build 2011-11-22 00:35:22 +00:00