Commit Graph

316 Commits

Author SHA1 Message Date
Miika Hamalainen
8394f65d4a Dynamic Paint:
* Object velocity can now be used to determine brush influence and color.
* Brushes can now be set to "smudge" existing paint.
* Added new operators to easily add and remove surface output mesh data layers from Dynamic Paint ui.
* Fixed drip effect algorithm to work properly on forces pointing towards surface.
* Adjusted drip effect speed.
* Drip effect can now use canvas velocity and acceleration to influence drip direction.
* Fixed texture mapping for material enabled brushes.
* "Object Center" type brushes can now use "material color" as well.
* Improved surface partitioning grid generation algorithm.
* Fixed possible invalid brush collision detection when OpenMP enabled.
* Fixed incorrect random sized particle displace/wave influence.
* Fixed "Object Center" brush color ramp falloff.
* Fixed invalid zero alpha sampling when rendering vertex colors.
* Lots of smaller tweaking.
2011-08-03 18:31:48 +00:00
Joerg Mueller
29f214f7f3 Merging up to trunk r38834. 2011-07-29 21:28:18 +00:00
Campbell Barton
73dde4e26f svn merge -r38718:38804 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-29 02:03:53 +00:00
Campbell Barton
71692e802f py api:
- added menu templates
- move template menu into the header of the text editor (so users will find more easily)
- updated mathutils examples, switching the order of multiplication.
2011-07-26 07:39:00 +00:00
Campbell Barton
fc95382a97 svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-26 03:55:23 +00:00
Campbell Barton
cadfac5a0f svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-25 17:51:30 +00:00
Campbell Barton
cc0abf9963 svn merge -r37900:38000 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-25 16:12:54 +00:00
Campbell Barton
a7815053ef svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender
manually merged source/blender/editors/uvedit/uvedit_unwrap_ops.c
2011-07-25 12:59:54 +00:00
Campbell Barton
97d0846d2c svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-07-24 13:03:48 +00:00
Miika Hamalainen
2a97e5a772 Merge with trunk r38619 2011-07-22 18:51:53 +00:00
Miika Hamalainen
cbe1613c01 Dynamic Paint:
* Surface bake data is no longer recalculated every frame, but only when surface mesh has moved/transformed. Results in multiple times better performance on high resolution surfaces when using sub-steps or surface is still.
* Heavily optimized particle brushes when random particle size enabled. Up to 10x speedup with large radius particles.
* Added an additional "grid" space partitioning structure for surfaces.
* Added bounding box checks for brushes.
* Smaller overall optimization.
* Further OpenMP parallelization.
* Added physics tab link to modifier panel.
* Fix: "Point Density" texture cache wasn't properly updated. Brushes can now use Point Density textures as well.
* Fix: Paint dissolve resulted in black color.
* Fix: KD-tree checkups weren't completely thread safe. Fixes possible crash with OpenMP enabled particle brushes.
* Fix: When brush was set to use a specific material, it was saved incorrectly and resulted in potential crashes on next load.
2011-07-22 18:37:30 +00:00
Joerg Mueller
4532bd731d Merge with trunk up to r38584. 2011-07-21 21:11:58 +00:00
Campbell Barton
5792bd7cc7 cmake: cleanup include paths, some duplicates and going up some unneeded dirs. 2011-07-17 09:11:13 +00:00
Campbell Barton
3a6158a8bf move mathutils into its own lib. 2011-07-15 04:01:47 +00:00
Miika Hamalainen
2420439773 Merge with trunk r38225 2011-07-08 11:16:13 +00:00
Sergey Sharybin
074ac7c09b Add ED_object_pose_armature to stubs.c. This should fix compilation
issues with blenderplayer.
2011-07-07 21:02:31 +00:00
Brecht Van Lommel
3d5ae95986 Fix #27863: converting curve spline type from python crashes. 2011-07-05 08:57:11 +00:00
Brecht Van Lommel
398807e235 Fix #27785: blenderplayer + eltopo linking error. 2011-07-04 13:03:41 +00:00
Miika Hamalainen
fdc59b8a40 Merge with trunk r38042 2011-07-02 18:15:55 +00:00
Brecht Van Lommel
8ddd2db648 RenderEngine API: add self.report() error reporting function for render engines,
works the same as for operators. Also includes some refactoring of render error
reporting code to use ReportList.
2011-06-28 16:25:07 +00:00
Miika Hamalainen
c896fcae79 Merge with trunk r37849 2011-06-27 08:11:05 +00:00
Campbell Barton
b15a2b0ffc cmake: added FindOpenJPEG module. 2011-06-19 07:46:24 +00:00
Miika Hamalainen
b937a4f5b6 Merge with trunk r37546 2011-06-16 12:00:03 +00:00
Campbell Barton
c2e1f3a1e2 fix for using system includes, the include macro wasn't un-setting the previous include list so system includes could be mixed up with non system includes.
Also workaround for CMake 2.8.4 & GNU-Make which doesn't set CMAKE_INCLUDE_SYSTEM_FLAG_C
2011-06-11 06:00:28 +00:00
Campbell Barton
f122a74b1e svn merge -r37078:37335 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-06-09 15:20:29 +00:00
Campbell Barton
a440679c57 edits to make these cmake files compatible with my own basic cmake parser which checks for correctness in our files. 2011-06-04 11:06:41 +00:00
Campbell Barton
8949387186 svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-31 05:28:00 +00:00
Campbell Barton
09da9d4393 cmake maintenance
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
2011-05-31 01:15:44 +00:00
Miika Hamalainen
3b41ab432b Applied Dynamic Paint 1.18f patch as a codebase for GSoC. 2011-05-24 07:08:58 +00:00
Campbell Barton
4514be8f4f svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-17 07:03:12 +00:00
Mitchell Stokes
d25be80320 stubs.c update: ED_view3d_from_m4() 2011-05-14 06:24:29 +00:00
Campbell Barton
33bfcb26b8 manually copy more changes from trunk. 2011-05-12 09:02:39 +00:00
Campbell Barton
191ad54599 svn merge -r36603:36628 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-05-12 05:35:19 +00:00
Nicholas Bishop
910220be47 == Radial control ==
Patch to make the radial control more generic with RNA. Patch was
reviewed here: http://codereview.appspot.com/4280080/

Prior to this update, the radial control code in trunk had generic
parts of the radial control implemented as an incomplete operator
within WM. Then each different user of the radial control had to
implement a separate operator to actually pass in specific brush data
-- e.g. sculpt's brush size, vpaint's brush size, etc.

This patch removes all the extra operators and makes the WM operator
do everything. It now takes several RNA path strings as its properties
-- the only required property is data_path, which specifies the data
to be modified by the radial control. The other paths affect display
in various ways, e.g. rotation, color, etc.

In addition to decreasing some duplicate paint brush code, these
updates make it pretty easy to enable radial control for other
purposes (and it can be set up entirely though python or keymaps, no
extra C code needed.)
2011-05-12 01:57:47 +00:00
Brecht Van Lommel
3a34dcde68 Code cleanup: remove readblenfile module, only contained some utility functions
to read .blend files from runtimes, folded those into blenloader.
2011-05-11 19:29:23 +00:00
Joseph Eagar
6ef77cf95a =bmesh= merge from trunk at r36529 2011-05-08 23:43:18 +00:00
Brecht Van Lommel
cb12337363 Code cleanup: remove source/kernel module, this wasn't really the kernel of
anything, only contained a hash map and functions to pass command line args
to the game engine. Moved those to container and BlenderRoutines modules.
2011-05-06 20:18:42 +00:00
Brecht Van Lommel
576035f9e1 Patch #27225: blenderplayer resource compilation error fix for cmake + mingw,
patch by Ryakiotakis Antonis.
2011-05-06 08:16:44 +00:00
Dalai Felinto
905289eb60 bplayer stub update + remove some tabs 2011-05-03 18:31:01 +00:00
Brecht Van Lommel
e23e125c34 Fix for revision 36403, using BLI_findstring. This loop looks for the last
found entry, not the first, made this a bit more explicit in the code now.
2011-05-02 12:07:07 +00:00
Campbell Barton
b12d46f73e - fix for player linking
- added notes to release todo's.
- renamed view3d view transform matching functions.
- added assert in edge split modifier to make a certain bug easier to spot.
2011-04-26 10:38:18 +00:00
Campbell Barton
75e1104d92 cmake
- allow building blenderplayer with redcode.
- when ffmpeg is enabled remove strict compiler errors for imbuf and blenkernel since its hard to avoid these warnings across ffmpeg versions.
2011-04-18 07:11:40 +00:00
Joseph Eagar
c98148a963 =bmesh= merge from trunk at r36153 2011-04-15 01:19:13 +00:00
Campbell Barton
a42bf45333 revert Joseph Eagar's eltopo commits r36073, 36075 (& some minor edits)
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners.

Its also too close to release to be making these kinds of changes.

commands used:

  # reverse merge
  svn merge -r36073:36072 .
  # for some reason this gave a lot of property changes
  svn revert `svn st | grep "^ M" | awk '{print $2}'`
  # reverse merging didn't work here, removing while dir.
  svn rm extern/eltopo/


  # manually fixed conflict in
  # ./source/blenderplayer/CMakeLists.txt
  #
  # also manually removed 2 lines from
  # ./CMakeLists.txt
2011-04-12 11:09:10 +00:00
Campbell Barton
3a73a75e84 enable blenderplayer library sorting on windows, (was already enabled for blender), resolves linking issue on windows 2011-04-12 01:56:03 +00:00
Joseph Eagar
0a60bc14d6 =cloth collisions=
Plugged the eltopo library into the cloth solver.
I was playing with it earlier, and it's so easy to
use I decided to quickly put it in (trunk's) cloth.

See http://www.cs.ubc.ca/labs/imager/tr/2009/eltopo/eltopo.html
.  The authors are on the bleeding edge of continuous collision
detection (one of them did ILM's cloth sim).  
I
don't really have to time to plug it into softbody, particles,
bullet, fluid, etc, but doing so would be pretty straightforward.
I'll leave that up to someone else.

To use, turn on USE_ELTOPO (in cmake) or WITH_BF_ELTOPO in scons.
2011-04-09 23:19:11 +00:00
Nathan Letwory
9feb70d390 Add missing defines for .rc file. 2011-04-08 22:07:17 +00:00
Campbell Barton
ca254dd37b add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their own glew library. 2011-04-05 23:31:01 +00:00
Campbell Barton
cd9b42871c remove bpy python api from blenderplayer, it was being linked but not initialized/available. 2011-03-31 15:28:53 +00:00
Nathan Letwory
fd72840587 Add stubs for the new timer add and remove functions. 2011-03-28 05:37:25 +00:00