griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
66,005 Commits 1 Branch 0 Tags
c50ccc847613bbe02bea64cee3f744b449da170c
Commit Graph

66005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Sharybin
6374e3b49d DO not draw active outline for collapsed nodes when they're not selected 
Also made corrections to currently unused code
 2012-08-03 11:39:34 +00:00
Sergey Sharybin
e135bfe41b Correction top previous commit: tiles were counted in opposite way 2012-08-03 11:13:38 +00:00
Sergey Sharybin
535a17dd18 Tomato Cycles: fix own regression in currently rendering tile status 2012-08-03 10:55:33 +00:00
Lukas Toenne
771a7241b9 Fix for node placement when copying to/pasting from clipboard. Child node location is always relative to parent nodes (if the parent is also copied) and must not be offset. Also takes the offset of the edited node group in the editor into account now. 2012-08-03 10:51:29 +00:00
Sergey Sharybin
ecab45a018 Tomato Cycles: fix wrong center coordinate when using multi-device configurations 2012-08-03 10:42:21 +00:00
Campbell Barton
854e122e5d style cleanup: compositor 2012-08-03 10:19:13 +00:00
Lukas Toenne
c12d0fd76c Fix for node clipboard copy operator for Frame nodes. Was redirecting the parent pointer of the original instead of the copied nodes. 2012-08-03 10:18:52 +00:00
Campbell Barton
d3d510740c svn merge ^/trunk/blender -r49518:49520 2012-08-03 09:53:24 +00:00
Campbell Barton
52e31a4866 fix for bokeh blur using uninitialized memory - it would cause some tiles not to be blurred. 
was in fact a bug in MemoryBuffer::getMaximumValue
 2012-08-03 09:51:10 +00:00
Sergey Sharybin
f736f183a5 Merging r49499 through r49518 from trunk into soc-2011-tomato 2012-08-03 09:08:40 +00:00
Campbell Barton
db8c9c24f6 code cleanup: remove unused includes 2012-08-02 23:03:16 +00:00
Thomas Dinges
ffd8352f56 Typo fix, sorry. :/ 2012-08-02 22:07:10 +00:00
Campbell Barton
8f07833ed5 code cleanup: move node background image operators into node_view.c 2012-08-02 21:52:09 +00:00
Thomas Dinges
fa04832247 Code cleanup: 
* Removed some remaining defines for AVI_CODEC (from the old 2.4x days and windows only), because only some defines were left, no underlying code to bring back, so just as good remove for good.
 2012-08-02 21:50:49 +00:00
Campbell Barton
5e60ccc65c rename node_state.c --> node_view.c 2012-08-02 21:36:33 +00:00
Campbell Barton
e86e5074f6 code cleanup: double promotion warnings 2012-08-02 21:17:12 +00:00
Tamito Kajiyama
8a340981be Added the functionality to make a copy of the active modifier in the Parameter Editor mode. 
Code contribution by flokkievids.  Thank you!
 2012-08-02 20:30:23 +00:00
Sergey Sharybin
1a5998bc4e Remove old boolean operation module 
Carve proved it's a way to go, so the time have came to get rid of old
boolean operation module which isn't used anymore.

Still kept BOP interface but move it to BSP module. At some point it
could be cleaned up further (like perhaps removed extra abstraction
level or so) but would be nice to combine such a refactor with making
BSP aware of NGons.

Tested on linux using both cmake and scons, possible regressions on
windows/osx. Would check windoes build just after commit.
 2012-08-02 16:42:30 +00:00
Campbell Barton
ba5c635502 fix for crash when node groups loose their ID pointer references (when linked libs don't load) 2012-08-02 16:33:38 +00:00
Sergey Sharybin
7aa44d088f Node selection: make node active before it could be unselected by extending 
selection, which matches behavior of all other areas in blender.
 2012-08-02 16:01:05 +00:00
Sergey Sharybin
64aa98643d Fix #31753: GLSL not updated after deleting lights in multiple-scene setting 2012-08-02 15:49:20 +00:00
Daniel Genrich
dc67840db6 OpenEXR: Enable again for MSVC 2010 2012-08-02 14:21:25 +00:00
Sergey Sharybin
3c2fffd1a9 Tomato Cycles: experimental option to cancel rendering when doing initial synchronization 
This required wrapping create and update pytohn callbacks as  into begin/end
allow threading macroses. From quick tests this seems to be stable enough,
but more tests would be needed before considering this stable.
 2012-08-02 14:16:37 +00:00
Campbell Barton
ce3293b2d9 code cleanup: remove redundant float casts 2012-08-02 11:33:21 +00:00
Campbell Barton
a3cd8c5c61 svn merge ^/trunk/blender -r49478:49498 2012-08-02 11:29:32 +00:00
Campbell Barton
b9378a3083 fix for own regression in avi header writing. 2012-08-02 11:25:04 +00:00
Campbell Barton
7653eae381 improve not very helpful error message. 2012-08-02 10:42:40 +00:00
Sergey Sharybin
63d071cc3a Fix #32236: unstable z-buffer or z combine composition node 2012-08-02 10:20:14 +00:00
Lukas Toenne
9d2173518c Clipboard feature for nodes. With the Copy operator a copy of all selected nodes and links between them is stored in an offscreen list (not in the library). The Paste operator then in turn copies these into the active node tree in the editor. 
Currently does not support copying of animation data. This would require copying of individual fcurves etc. between data block, which is not implemented yet.

Also it is currently possible to circumvent some constraints of the nodes, in particular for node groups (e.g. no groups inside groups, render layer not inside groups).
 2012-08-02 09:52:37 +00:00
Sergey Sharybin
0a782a4550 Buildbot: package softwaregl scripts for buildbot builds 
Uses the same libs as release environment does
 2012-08-02 08:57:18 +00:00
Tamito Kajiyama
4ea2fb8b0a Merged changes in the trunk up to revision 49478. 
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
 2012-08-02 00:10:05 +00:00
Campbell Barton
829c48a991 code cleanup: headers 2012-08-01 20:39:14 +00:00
Daniel Genrich
8a0f6aa2f2 Bugfix: High resolution "exploded" when using uneven resolutions, sometimes with specific object scaling. 
Part of Smoke Development Phase III.

Credit also goes to MiikaH: It was a teamwork effort and took days to track down. :)
 2012-08-01 20:29:37 +00:00
Tamito Kajiyama
40e3dfd3bd Fix for Freestyle-related UI components showing up in the Render buttons when Cycles is selected. 2012-08-01 20:14:27 +00:00
Sergey Sharybin
ccf0b13fdc Merging r49463 through r49478 from trunk into soc-2011-tomato 2012-08-01 19:23:50 +00:00
Sergey Sharybin
6a6bcea817 Fix #31800: Blender crash by rendering in connection with linked groups 
Seems the issue was caused by render layer node overwritng active scene
when render button is clicked. It lead t situations when job was adding
with owner of rendering scene, but modal callback was checking for render
jobs existing for current active scene. There was no such jobs so operator
used to finish at this point and free report list used by render pipeline.

Solved by storing operator owner in operator's custom data. Probably
there's nicer way to do fix this issue but currently can't think of it.
 2012-08-01 19:22:04 +00:00
Campbell Barton
689c6133ea split node_edit.c into separate files (add, group, relationshops), was almost 5000 loc. 2012-08-01 19:11:17 +00:00
Sergej Reich
ce90041239 game engine: Fix CcdPhysicsEnvironment functions that accessed m_solverInfo 
The functions had no effect because m_solverInfo wasn't used anywhere.
Now we get the solver info from the dynamics world directly instead of using our own copy.
 2012-08-01 17:59:32 +00:00
Andrea Weikert
b876ca5611 fix: column flow layout wrongly calculated height of second and subsequent columns when used with more than 2 columns. 
* discovered while playing with the column flow layout in asset branch.
 2012-08-01 17:52:14 +00:00
Campbell Barton
ed36c625ee fix for assert when going from edit mode directly into sculpt mode. 
the tessellation faces were not pre-calculated.
 2012-08-01 17:25:10 +00:00
Sergej Reich
0245229021 game engine: Use flags instead of hardcoded numbers for rna properties 2012-08-01 17:19:32 +00:00
Sergey Sharybin
c7ba25fdf8 Fix own regression in cycles frame node caused by recent node rna changes 
--
svn merge -r49465:49466 ^/branches/soc-2011-tomato
 2012-08-01 16:17:44 +00:00
Sergey Sharybin
0f6eb8c2cd Fix own regression in cycles material group cased by recent changes in nodes rna 2012-08-01 16:16:10 +00:00
Campbell Barton
aa23f98bda rename meaningless LIB flag name LIB_TEST --> LIB_NEED_EXPAND. 2012-08-01 15:32:27 +00:00
Campbell Barton
693c43cd95 replace 'GET_INT_FROM_POINTER( &((BHeadN*)0)->bhead) )' with 'offsetof(BHeadN, bhead))' 2012-08-01 15:21:39 +00:00
Sergey Sharybin
3979aad82f Merging r49451 through r49462 from trunk into soc-2011-tomato 2012-08-01 15:05:42 +00:00
Campbell Barton
45801286a5 fix some more crashes when running skin operators on a mesh with no skin layer 2012-08-01 15:04:10 +00:00
Sergey Sharybin
cad8609172 Code cleanup: silence some -Wnarrowing warnings from C++11 2012-08-01 15:02:09 +00:00
Thomas Dinges
2fcd6827bf Cycles: 
* Removed outdated OpenCL comments, kernel features are defined in kernel_types.h now.
 2012-08-01 14:56:15 +00:00
Campbell Barton
f86bd9d39a fix crash in sorting mesh elements when called without a viewport. 2012-08-01 14:51:49 +00:00