sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
38,710 Commits 2 Branches 0 Tags 753 MiB
dfc19a1ff7
Commit Graph

288 Commits

Author SHA1 Message Date
Campbell Barton
d4b6927179 remove NULL check in TREESTORE macro, the return NULL value wasny checked for by any callers (ie - it would crash later if the arg was NULL anyway) 
also comment on the speed of check_persistent()
 2012-05-27 14:43:18 +00:00
Brecht Van Lommel
6b554c5ec4 Fix for last commit, forgot to update Screen.is_animation_playing python property. 2012-05-25 12:56:29 +00:00
Campbell Barton
57c292daf0 style cleanup 2012-05-25 09:51:53 +00:00
Nicholas Bishop
d227d07112 Fix for compiling with player after skin modifier commits. 
Removed the bad_level_call_stubs for BLI_heap functions; player is
being linked with blenlib, so this gives multiple-definition linker
errors.
 2012-05-22 15:55:02 +00:00
Campbell Barton
2d2d36fe3b code cleanup: 
- style - multi-line ifs move braces onto new lines.
- iterators - convert some to macros, other split up and move brace.
 2012-05-20 19:49:27 +00:00
Antony Riakiotakis
fe0d1a3810 Fix blenderplayr compilation 2012-05-17 13:30:20 +00:00
Jeroen Bakker
044e818cf8 ____ 
`````|````` | |        |                        ..'''' 
     |      | |        |______               .''       
     |      | |        |                  ..'          
     |      | |_______ |___________ ....''             
               merge to TRUNK!

 * The old compositor is still available (Debug Menu: 200)

This commit was brought to you by:

Developers:
 * Monique Dewanchand
 * Jeroen Bakker
 * Dalai Felinto
 * Lukas Tönne

Review:
 * Brecht van Lommel

Testers:
 * Nate Wiebe
 * Wolfgang Faehnle
 * Carlo Andreacchio
 * Daniel Salazar
 * Artur Mag
 * Christian Krupa
 * Francesco Siddi
 * Dan McGrath
 * Bassam Kurdali

But mostly by the community:
Gold:

    Joshua Faulkner
    Michael Tiemann
    Francesco Paglia
    Blender Guru
    Blender Developers Fund

Silver:

    Pablo Vazquez
    Joel Heethaar
    Amrein Olivier
    Ilias Karasavvidis
    Thomas Kumlehn
    Sebastian Koenig
    Hannu Hoffrén
    Benjamin Dansie
    Fred M'ule
    Michel Vilain
    Bradley Cathey
    Gianmichele Mariani
    Gottfried Hofmann
    Bjørnar Frøyse
    Valentijn Bruning
    Paul Holmes
    Clemens Rudolph
    Juris Graphix
    David Strebel
    Ronan Zeegers
    François Tarlier
    Felipe Andres Esquivel Reed
    Olaf Beckman
    Jesus Alberto Olmos Linares
    Kajimba
    Maria Figueiredo
    Alexandr Galperin
    Francesco Siddi
    Julio Iglesias Lopez
    Kjartan Tysdal
    Thomas Torfs
    Film Works
    Teruyuki Nakamura
    Roger Luethi
    Benoit Bolsee
    Stefan Abrahamsen
    Andreas Mattijat
    Xavier Bouchoux
    Blender 3D Graphics and Animation
    Henk Vostermans
    Daniel Blanco Delgado
    BlenderDay/2011
    Bradley Cathey
    Matthieu Dupont de Dinechin
    Gianmichele Mariani
    Jérôme Scaillet

Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó, 
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli, 
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein, 
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio, 
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel, 
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey, 
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter, 
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini, 
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch, 
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson, 
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song, 
Dylan Urquidi )
 2012-05-17 12:49:33 +00:00
Antony Riakiotakis
de067b2e0d update stubs for blenderplayer 2012-05-08 23:48:04 +00:00
Campbell Barton
1dccd4c98a code cleanup: naming - pose/armature/image 
also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
 2012-05-05 16:03:57 +00:00
Antony Riakiotakis
2f38f09c38 Add stubs to get blenderplayer compiling 2012-05-01 11:16:34 +00:00
Campbell Barton
343edf2722 style cleanup: function calls & whitespace. 2012-04-29 17:11:40 +00:00
Brecht Van Lommel
1df6f88b5d Fix blenderplayer build, added stub. 2012-04-17 16:51:10 +00:00
Miika Hamalainen
329c665c16 Fix blenderplayer compile. 2012-04-04 10:55:55 +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
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
Sergey Sharybin
03ebd2091b Add stub needed for blenderplayer compilation. 2012-03-05 17:23:52 +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
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
Miika Hamalainen
a921d9d22b Fixed blenderplayer compile for msvc. 2012-02-20 08:06:24 +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
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
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
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
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
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
Campbell Barton
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
Campbell Barton
3c8d86e117 svn merge ^/trunk/blender -r41961:41998 2011-11-20 01:14:33 +00:00