Commit Graph

33985 Commits

Author SHA1 Message Date
Campbell Barton
eadb192986 svn merge -r41723:41751 ^/trunk/blender 2011-11-11 06:37:29 +00:00
Campbell Barton
92d35b74e7 svn merge -r41722:41723 ^/trunk/blender 2011-11-11 06:25:45 +00:00
Campbell Barton
67386c003d svn merge -r41715:41722 ^/trunk/blender 2011-11-11 05:52:46 +00:00
Campbell Barton
1649521abe fix [#29203] Camera can still move even when transforms locked
added object_tfm_protected_backup, object_tfm_protected_restore so its easier to transform the object and respect protected channels (otherwise you need checks everywhere for each channel which is verbose).
2011-11-11 05:34:07 +00:00
Campbell Barton
11947f1a67 pep/style edits & quiet some warnings 2011-11-11 03:28:46 +00:00
Joshua Leung
4e5c03f06e Bugfix [#29210] ChildOf constraint Set Inverse
For Objects, Set Inverse was unreliable as the constraint didn't get reset
properly before being calculated
2011-11-11 00:44:48 +00:00
Thomas Dinges
cea9c518d5 Dynamic Paint UI:
* Code cleanup, changed some splits to row's, much nicer when you only use 2 properties in a row.
* if > elif
* Removed some duplicated code for an if/elif/else check

Did some minor separator() changes too.
2011-11-10 20:31:50 +00:00
Thomas Dinges
9e3deee808 2.6 Physics UI Files:
* Remove redundant check for md, this is already done in the super class poll.
2011-11-10 19:10:23 +00:00
Guillermo S. Romero
c8cb79a11f SVN maintenance. 2011-11-10 17:43:37 +00:00
Sergey Sharybin
8ef6d50185 Mark unused variable. 2011-11-10 17:19:12 +00:00
Brecht Van Lommel
7d110c2923 Cycles: fix missing particle panels and show emitter option not being respected. 2011-11-10 16:02:46 +00:00
Andrew Wiggin
f9f4ad6a84 Disable Cycles for BMesh until it compiles 2011-11-10 15:40:36 +00:00
Brecht Van Lommel
9dcf4bf0a6 Cycles: attempt to fix build issue with mingw. 2011-11-10 14:53:56 +00:00
Brecht Van Lommel
5b1a42cb17 Cycles:
* Fix excessive fireflies in Velvet BSDF (patch by David).
* Disable some unused SSE code
* Remove RTTI disabling flags for now, this is giving some compile issues and
  was only needed of OSL which we're not using yet.
2011-11-10 14:32:16 +00:00
Brecht Van Lommel
cf6a1320a8 Cycles: attempted fix for error building with sse/mtune optimization flags. 2011-11-10 14:13:32 +00:00
Brecht Van Lommel
3863aa9114 Cycles: fix crash in image assign/remove in image editor. 2011-11-10 13:39:25 +00:00
Brecht Van Lommel
7e518bca53 Nodes: fix crash loading old files that have node sockets changed, the version
patch for the default value storage needs to be done before lib linking,
otherwise this can crash. Fixes problem opening some old cycles files.
2011-11-10 13:38:55 +00:00
Andrew Wiggin
da93c1fde2 Fix [#29214] build modifier calculates wrong fraction of faces/verts/edges to draw 2011-11-10 13:28:58 +00:00
Brecht Van Lommel
2adcac7661 Cycles: when material/world/lamp doesn't use nodes, show color in the UI. 2011-11-10 13:00:53 +00:00
Miika Hamalainen
7bcd1a6c47 Dynamic Paint:
* Added BKE_dynamicpaint.h to CMake list.
* Changed some unsigned integers back to signed, as OpenMP can't iterate unsigned values anyway.
* Fixed more warnings.
2011-11-10 13:00:27 +00:00
Brecht Van Lommel
bce0ce5f0c Cycles: many of the new nodes were not showing properties/buttons in nodes in
the node editor.
2011-11-10 12:53:40 +00:00
Brecht Van Lommel
c42772fc95 Cycles:
* Add back option to bundle CUDA kernel binaries with builds.
* Disable runtime CUDA kernel compilation on Windows, couldn't get this working,
  since it seems to depend on visual studio being installed, even though for
  this particular case it shouldn't be needed. CMake only at the moment.
* Runtime compilation on linux/mac should now work if nvcc is not installed in
  the default location, but available in PATH.
2011-11-10 12:52:17 +00:00
Campbell Barton
dfc30d1229 quiet some warnings from recent merge 2011-11-10 12:28:26 +00:00
Sergey Sharybin
ba9794af02 Fixed possible issue drawing undistorted clip in clip editor.
Check for marker's visibility was a bit odd.
2011-11-10 12:15:09 +00:00
Bastien Montagne
662549b4ec Restored GPL header of NOD_composite.h (funny s&r ?!?). 2011-11-10 11:33:57 +00:00
Joshua Leung
9111213a98 Whitespace tweaks 2011-11-10 10:34:26 +00:00
Miika Hamalainen
afeb0eeaf0 Dynamic Paint merge:
Commit Dynamic Paint from "soc-2011-carrot" branch into trunk.

End-user documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Dynamic_Paint

GSoC wiki page:
http://wiki.blender.org/index.php/User:MiikaH/GSoC-2011-DynamicPaint
2011-11-10 10:24:34 +00:00
Sergey Sharybin
1e035381d1 Workaround #29205: Crash while using Edge Split modifier (while rotating vertices in edit mode with edge split viewable)
This bug is caused by exactly the same reason as #26316: differences in how new vertices/edges
are getting calculated first and how they're adding later. In some cases extra vertices are
creating which weren't counted before.

This patch prevents crash in such situations, but result mesh can be a bit wrong.
This should work fine in bmesh, so think it's acceptable to have such workaround
before actual fix coming with bmesh.
2011-11-10 08:29:22 +00:00
Campbell Barton
c2d6fc4da3 - possible fix for vertex paint 'fill' crash.
- remove unneeded call to defvert_find_index() when weight painting.
2011-11-10 06:06:35 +00:00
Campbell Barton
cd9b51c1bf add some missing headers to cmake, also add some files as comments since it seems they should be added but evidently work fine without. 2011-11-10 06:05:22 +00:00
Campbell Barton
121ff4223d svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build 2011-11-10 04:17:43 +00:00
Campbell Barton
77c5160791 quiet warning 2011-11-10 04:03:08 +00:00
Campbell Barton
5caf6e9070 presets now work from non-redo popups,
ended up having to add a new pointer into the uiBlock (which I'd rather have avoided), but setting the uiLayoutSetContextPointer(..) was complicated to properly use for submenus and popus.
2011-11-10 03:44:50 +00:00
Campbell Barton
a96c3ce9e0 fix compile errors for previous merge 2011-11-10 03:40:02 +00:00
Campbell Barton
685041d53a svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs 2011-11-10 03:05:11 +00:00
Jason Hays
08cc1c6bb9 While reviewing this part of the code for a Blender Proceedings article, I noticed that the lock enforcer was taking several improper steps to redistribute evenly with multi-paint.
Beforehand, a few problems were in view: some of the indexing was changed towards the end to use the more efficient stack structure, but needed to use the correct def group indices.

Also, the designated selected group would use its own value to acquire the standard to base change distributed to the others.

Lastly, the total_change was used rather than -left_overs in the formula to compute the new designated weight within the means of the locks' allowed changes.


Now, while maintaining the ratios of the selection, it correctly returns left over change that could not be redistributed to the unlocked groups.
2011-11-10 02:09:58 +00:00
Campbell Barton
ee1828be19 svn merge -r41649:41650 ^/trunk/blender 2011-11-10 01:58:48 +00:00
Campbell Barton
130b4429b0 svn merge -r41638:41648 ^/trunk/blender 2011-11-10 01:50:22 +00:00
Sergey Sharybin
ce15c0c943 One library from OpenEXR is needed for oiio. Hope buildbot is working fine now. 2011-11-09 19:25:16 +00:00
Sergey Sharybin
473ebc8827 Disable libmv for blenderplayer rules used by buildbot 2011-11-09 19:04:17 +00:00
Sergey Sharybin
f09f5eec57 - Added options to link staticly against oiio/boost
- Also changed buildbot settings so now linking should happe staticly
2011-11-09 19:02:42 +00:00
Antony Riakiotakis
2a747e8b03 Fixes for MinGW cmake debug build:
* OpenEXR doesn't need debug suffix
* Fix libmv template issue when linking by removing duplicate libmv inclusion. I wonder how this never turned up in release builds as well.

Important: Since OpenImageIO went into trunk, OpenEXR, possibly along with other image libraries will need to be turned on too because OIIO depends on them.
2011-11-09 18:50:48 +00:00
Nathan Letwory
f0adbb7746 Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init.
Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).
2011-11-09 17:22:55 +00:00
Sergey Sharybin
1ff2018842 Enable Cycles for buildbot 2011-11-09 17:18:37 +00:00
Miika Hamalainen
1b4a54ad73 Merge with trunk r41701 2011-11-09 15:46:53 +00:00
Bastien Montagne
bc5ec4e69c Fixed/restored translation of node classes (in foreach_nodeclass funcs) 2011-11-09 15:00:11 +00:00
Andrew Wiggin
0811236da2 Fix a particle memory allocation mismatch using MEM_allocN for alloc and BLI_cellalloc_free for free 2011-11-09 14:39:49 +00:00
Bastien Montagne
e4269043b4 Moving i18n code to BLF_translation.h
This way, we will be able to use it in non-UI parts of the code too.
2011-11-09 14:13:17 +00:00
Antony Riakiotakis
ee1569b933 No tabs in scons! Sorry for that.. 2011-11-09 14:00:24 +00:00
Brecht Van Lommel
adf17b48d8 Cycles: mac + scons build should not work. 2011-11-09 11:49:39 +00:00