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
b06f238bb0
Fix blenderplayer utf8 cmake for MinGW (linking order matters for gcc)
2012-03-21 12:35:39 +00:00
c2531e47b6
Fix for compiling bplayer on cmake/win after adding utf support.
...
Reported by Miika
2012-03-20 23:10:46 +00:00
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
03ebd2091b
Add stub needed for blenderplayer compilation.
2012-03-05 17:23:52 +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
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
47c373c7a9
style cleanup (mostly whitespace)
2012-02-27 10:35:39 +00:00
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
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
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
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
a921d9d22b
Fixed blenderplayer compile for msvc.
2012-02-20 08:06:24 +00:00
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
379527581b
svn merge ^/trunk/blender -r44204:44213
2012-02-17 21:07:18 +00:00
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
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
c8037fb56a
svn merge ^/trunk/blender -r43530:43554
2012-01-20 12:34:00 +00:00
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
0f28c1c27a
svn merge ^/trunk/blender -r43461:43472
2012-01-17 21:08:25 +00:00
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
bbe69705a5
svn merge ^/trunk/blender -r43420:43436
2012-01-17 02:20:23 +00:00
f075f2babb
Corrected fix for linking issues with blenderplayer enabled
2012-01-16 18:49:10 +00:00
de50e6324a
Fix for compilation error using cmake+msvc
2012-01-16 18:24:30 +00:00
e0df491d1e
Merged changes in the trunk up to revision 43404.
...
Conflicts resolved:
source/blender/python/SConscript
2012-01-15 23:13:12 +00:00
a7b0a11811
svn merge ^/trunk/blender -r43278:43294
2012-01-11 15:04:54 +00:00
b308e61312
svn merge ^/trunk/blender -r43220:43278 --accept postpone
2012-01-11 14:14:04 +00:00
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
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
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
85242e9f6c
Fix blenderplayer build (by adding missing bad level call stubs)
2011-12-31 17:46:42 +00:00
78a4e24614
svn merge ^/trunk/blender -r43009:43033
2011-12-31 12:03:36 +00:00
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
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
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
063dd4f60a
svn merge ^/trunk/blender -r42197:42221
2011-11-28 17:09:13 +00:00
911be02fcd
remove duplicate extern_colamd from blenderplayer cmake
2011-11-28 08:38:08 +00:00
b6569ee4e7
Merged changes in the trunk up to revision 42116.
2011-11-26 13:11:55 +00:00
74c6c91ba6
svn merge ^/trunk/blender -r42080:42095
2011-11-23 17:14:27 +00:00
a91bd43d38
Fix compilation error of blenderplayer caused by recent commit.
2011-11-23 16:44:33 +00:00
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
da25b50ccb
image save operator now shares settings and UI with render & image out node.
...
details:
- setting format options from python isnt possible anymore since this isnt exposed via op->properties, python should use image.save() function instead.
- image save UI now hides 'Relative' option when copy is selected since it has no effect.
- default image depth is set to 8 or more if the image has no float buffer, otherwise its set to 32 or less.
other fixes:
- image new was adding an image with a filepath set to "untitled", if this file happened to exist in the current directory a save on the generated image would overwrite it, now initialize to empty path.
- BKE_ftype_to_imtype was returning an invalid value if ftype==0.
2011-11-21 23:56:32 +00:00
2676f2d58f
Merged changes in the trunk up to revision 42021.
...
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
2011-11-20 21:02:12 +00:00
3c8d86e117
svn merge ^/trunk/blender -r41961:41998
2011-11-20 01:14:33 +00:00
6fa4beb92f
Updated stubs so blenderplayer is compiling again.
2011-11-18 16:49:03 +00:00
5600d214f1
svn merge ^/trunk/blender -r41939:41954
2011-11-18 05:06:53 +00:00
db44a92a11
pydrivers: 'frame' is now in the driver namespace,
...
- no need to link to scenes when using a frame from the pydriver, this made linking rigs for eg, quite messy.
- advantage that we get subframe values (where scenes from was fixed to a whole number).
2011-11-17 07:08:09 +00:00
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
49ccf975f2
minor cleanup
...
- use NULL rather then 0 for pointers
- use static functions where possible
- add own includes to ensure func's and their declarations don't get out of sync.
2011-11-14 16:05:44 +00:00
