Commit Graph

4181 Commits

Author SHA1 Message Date
Brecht Van Lommel
137e53064c Revert revision 29735:
Fix #22051: crash when scaling parent metaball. Keep the constant resolution
for any motherball's scale.

This avoids running out of memory when scaling the metaball down, but there's
a reason it depends on this scaling, for example for instancing it's more
useful to have this. It also doesn't really solve the problem but only moves it,
it's still possible to run out of memory with different setups/scales.
2010-07-06 11:44:45 +00:00
Campbell Barton
ca252e39f5 Correction to recent color balance compositor and sequencer changes.
- In my changes lift was acting like a second gamma.
- In blender 2.4x it was being added which gave ugly clipping.
- in Magic Bullet Looks it scales the color about 1.0: (col - 1 * (2-lift)) + 1

Did more testing and made sure the order of applying lift/gamma/gain works the same as MagicBulletLooks (tested on Collin's mac laptop).
2010-07-06 10:21:28 +00:00
Campbell Barton
aea7ea5b30 recent commit broke invert option for sequencer lift. 2010-07-05 14:53:11 +00:00
Campbell Barton
b1cdc52b30 Color Balance Node
changes from sequencer applied to compositor mostly noticable is how the lift works.

Before & After,
http://www.graphicall.org/ftp/ideasman42/color_balance_before_after.png

even with lower values these kinds of errors can be seen.
2010-07-05 14:29:16 +00:00
Brecht Van Lommel
efeb8148c8 Fix #22213: applying deform modifier in front of multires modifier crashes,
should not do multires reshape in this case, but just regular apply.
2010-07-05 12:20:49 +00:00
Brecht Van Lommel
5bacd2df29 Fix #22666: linked data lights lag during transform in GLSL mode.
Actually a depsgraph issue, transforming objects was incorrectly
tagging their data for recalculation.
2010-07-05 11:52:54 +00:00
Campbell Barton
c9f667a92e texture saturation option.
we'll need a do-version bump soon or this will convert 0.0 saturation to 1.0 on load.
2010-07-05 10:18:59 +00:00
Campbell Barton
58778d41e2 Color Balance
- color_balance_float_float wasnt using the new calculation method
- moved calculation into an inline function color_balance_fl() & made the lift adjustments less confusing.
2010-07-05 09:56:06 +00:00
Joshua Leung
faf1c9a4bb Bugfix #22685: Screen update slow, animation player ALT-A, files created with 2.4x
Modifiers were being mistakenly recalculated at every frame as long as the object had animation, slowing things down due to incorrect depsgraph recalc tags.

Renamed OB_RECALC -> OB_RECALC_ALL to reduce future confusion. During this process, I noticed a few dubious usages of OB_RECALC, so it's best to use this commit as a guide of places to check on. Apart from the place responsible for this bug, I haven't changed any OB_RECALC -> OB_RECALC_OB/DATA in case that introduces more unforseen bugs now, making it more difficult to track the problems later (rename + value change can be confusing to identify the genuine typos).
2010-07-05 03:55:28 +00:00
Joshua Leung
8c042f779f Bugfix #19221: Layer animation not working
Now object layers and scene-base layers are now always synced. In 2.4x, they were only synced if there was animation for layers, but it's probably not worth checking for this these days...

Finally we can close this bug report :)
2010-07-05 01:11:25 +00:00
Campbell Barton
9c4e3a7b6b bugfix [#22724] "Scene" switch on the console doesn't work 2010-07-05 00:00:40 +00:00
Campbell Barton
a824220d3e better errors for failier to read blends 2010-07-04 23:26:55 +00:00
Campbell Barton
83a2a4e5b8 Improvements to Blenders color balance (lift/gamma/gain).
Fairly closely match some mac application colin has called 'Looks', to give better results.
- lift is now applied non linear (was being added to the color)
- change the color wheel to preserve the luminance of the gamma and gain values, this stops the color from being set too dark (option for the color wheel template).
- sub-pixel precission for the color wheel since the white area at the center can make a lot of difference with a very small change.

This change will make existing node and sequencer setups lift render slighly differently however discussed this with Ton and he's ok with it.
2010-07-04 20:59:10 +00:00
Andrea Weikert
ca81aa704e Patch [#22339] File/installation paths changes
Patch Tracker: http://projects.blender.org/tracker/?func=detail&aid=22339&group_id=9&atid=127

This patch implements the proposal outlined here:
http://wiki.blender.org/index.php/Dev:2.5/Source/Installation/Proposal

Original patch by Matt Ebb.
Contributions by Nathan Letwory, Damien Plisson and Andrea Weikert

NOTE:
This is a work in progress commit, some work still needs to be done on the SCons and CMake files for this to work properly, but at least should compile and the files should be created in the right directory.

Commit discussed on IRC with Ton and Campbell.
2010-07-04 15:35:23 +00:00
Joshua Leung
ace570cb10 Fix for 15-day-old bug causing crashes when loading old 2.49 files, especially those with animation.
Reverting 29563 ("* Moved do_versions_ipos_to_animato from blender.c to readfile.c, where it should be.") part to the original version that (so far) is guaranteed to work fine. 

While this means that "nice software design" isn't obeyed once again, this works and the other approach doesn't. So far there really isn't anything really obviously different between the approaches, even after trying a few different placements of the version patches within the file-reading internals.
2010-07-04 12:16:01 +00:00
Campbell Barton
f9933b2fee commenting group timeoffset since it causes groups objects to recalculate modifiers etc. constantly even when animation isnt playing. 2010-07-04 11:56:31 +00:00
Campbell Barton
8aa0f9b033 last fix still could give corrupt sound, rather then updating the sound info just add and remove the sound handle. 2010-07-04 10:51:10 +00:00
Campbell Barton
5553f66eb7 sequencer
- effects strips now add directly above the strips they operate on (almost always what you want)
- blend mode for new image/movie/scene/color strips is now cross: without this adjusting alpha will fade to black rather then the strip below.
- SEQ_HAS_PATH macro didnt include sound-ram or sound-hd
- meta drawing code has misleading variable names (from own commit).
2010-07-04 08:49:54 +00:00
Peter Schlaile
6e5a436f56 == Sequencer ==
This fixes:
[#22722] Removing a sequence strip doesnt remove assosiated fcurves

by using the same hack that is used for moving curve-data along with the 
strips on grab.

Should be cleaned up (both functions!) by making sequencer-strips 
finally true IDs.

Until that happens, there is only an more or less ugly way of doing 
that.
2010-07-03 21:13:08 +00:00
Campbell Barton
80f6102629 better reporting for file i/o failier, use system error message in more places: Permission Denied, No space left, File not found etc.
- blend load/save uses os message.
- image load gives os message. (remove check for slash at end of line, just let the os report an error)
- python api load image/font/text raise errors with message (was just retuning None for image and font)
- minor edits to py api errors.
2010-07-03 17:47:06 +00:00
Brecht Van Lommel
7a495a12e1 Fix for layer restoring with duplis, could be wrong sometimes
when there with multiple instances and recursion.
2010-07-03 17:19:44 +00:00
Campbell Barton
15be7b215f - changes to the sequencer so new strips use the data name.
- removed the name option for the sequence operators.
2010-07-02 20:09:42 +00:00
Brecht Van Lommel
6ff10f00d4 Bugfix: effector weights were not copied when copying particle settings. 2010-06-30 14:43:28 +00:00
Campbell Barton
35dd09a9ef add alpha option for new images (operator and function) 2010-06-29 22:07:27 +00:00
Nicholas Bishop
fab7671d20 Fixed bug #22686, Screw modifier VBO-related crash
* Problem was calling setDrawOptions even if there was no original face index to use
2010-06-29 15:56:05 +00:00
Campbell Barton
a726793507 default to global space for point density cache space. 2010-06-28 16:37:50 +00:00
Sergey Sharybin
8517a7a3cd Fix #20965: metaballs partticles and volume material crash rendering
Fix #21187: 2.5svn26947 - particles + meta sphere = crash in rendering

Use separated displists for mballs in view3d and render stuff.
Do not recalculate displist for view3d while rendering - mball.c
uses several global variables which shouldn't be accepted from
parallel threads.
2010-06-28 11:07:02 +00:00
Matt Ebb
aae952be1f Fix [#22669] Packing a .wav used in a LB crashes Blender 2010-06-28 00:11:28 +00:00
Sergey Sharybin
650de24271 Recalculate motherball when metaball is deleting 2010-06-27 12:45:09 +00:00
Sergey Sharybin
3262dfdadd Fix #22051: crash when scaling parent metaball
Keep the constant resolution for any motherball's scale
2010-06-27 08:35:27 +00:00
Matt Ebb
e86c5cf9ea Fix [#22564] Object name by object type
Restored auto-naming newly created objects by type, for Mesh, Lamp, Meta
2010-06-27 07:45:57 +00:00
Matt Ebb
03fa4bb999 Partial cleanup of timing system, with some guidance from Joshua:
* Fractional frames support has been changed to use a new var, scene->r.subframe. 
This is a 0.0-1.0 float representing a subframe interval, used in generating a final float 
frame number to evaluate animation system etc.
* Changed frame_to_float() and some instances of bsystem_time() into a convenience function:
float BKE_curframe(scene) which retrieves the floating point current frame, after subframe
and frame length corrections.
* Removed blur_offs and field_offs globals. These are now stored in render, used to 
generate a scene->r.subframe before render database processing.
2010-06-27 05:39:55 +00:00
Campbell Barton
f3ffb22598 error in fix for ID property copy 2010-06-25 12:17:35 +00:00
Campbell Barton
7b36b2ebbb - duplicating a scene now duplicates its sequence strips too.
- bugfix for copying a scene with FFMPEG properties set (wasnt copying the ID properties, could crash blender)
- relative path option for adding sequence strips and replaceing images.
2010-06-25 12:04:04 +00:00
Sergey Sharybin
29b402f376 Fix #22618: Deleting an object doesnt remove its self from pinned buttons
Clear pin flag and pin ID in unlink_object if pinid points to unlinking object
2010-06-25 11:41:39 +00:00
Campbell Barton
4c81019823 Move some sequencer functions about, no functional changes.
- Remove SEQ_DESEL, better not have a flag which includes ~, use ~SEQ_ALLSEL instead.
- Rename recurs_dupli_seq -> seqbase_dupli_recursive
- Rename deep_dupli_seq -> seq_dupli_recursive
2010-06-24 10:04:18 +00:00
Brecht Van Lommel
4e39133970 Fix #21370: VBO does not display material colors in textured solid. 2010-06-23 16:35:42 +00:00
Campbell Barton
4596588fe8 - avoid divide by zero with node progress
- write_crash_blend() was writing to the original path.
2010-06-23 15:07:20 +00:00
Brecht Van Lommel
989cca1434 Fix #21369: normals on extruded text and curve objects were flipped
for the backside, giving problems with e.g. boolean operations.
2010-06-23 13:18:50 +00:00
Sergey Sharybin
46d28a5e8d Sculpt+shape keys:
- Sculpting on the basis key should change original mesh
- For relative keys sculpting on basis key should update others
2010-06-23 12:27:13 +00:00
Campbell Barton
2567129e7f Converting a mesh into a mesh (alt-c), was broken with shape keys and modifiers that changed the vertex count.
removal of the shape key was undone in DM_to_mesh().
2010-06-23 10:18:51 +00:00
Sergey Sharybin
d200243a5c Fix #22654: Converted curve from mesh disappearing
Curve object should have ob->bb=NULL if there is no derivedMesh
2010-06-23 09:58:02 +00:00
Peter Schlaile
df76cebb8a == Sequencer ==
Removed "frame_locked"-flag from sequencer completely, since it doesn't 
work any more in Blender 2.5. (All IPOs are frame-locked now anyways.)
2010-06-22 21:09:50 +00:00
Brecht Van Lommel
c28aec9ae1 Fix #22589: pressing subdivide or updating displacements after sculpting
on multire would unnecessarily subdivide vertex groups and other layers,
making the operation slower than necessary.
2010-06-22 16:46:13 +00:00
Brecht Van Lommel
e0368d31a5 Enabled openmp multithreading for multires/subsurf again, but only
if there are >= 1 million faces estimated in the resulting mesh.

(merge from render25 branch)
2010-06-22 15:09:41 +00:00
Matt Ebb
8bc1e44e33 slight cleaning of texture type changing functionality, done while working on other stuff today 2010-06-22 09:13:30 +00:00
Campbell Barton
4bade8e137 sequence.swap(other) rna function. 2010-06-21 22:05:34 +00:00
Sergey Sharybin
425da6206f [#22262] Sculpting shape keys using the Smooth brush switches the shape to the Basis
PBVH used the same verts array as mesh data and shape key/reference key coords
were applying on the mesh data, so on some refreshing undeformed mesh was
displayed.
Added utility functions to get vert coords from key block, apply new vert coords
on keyblock and function to apply coords on bpvh, so now pbvh uses it's ovn
vertex array and no changes are making to the mesh data.

Additional change:
Store key block name in SculptUndoNode, so now shape wouldn't be copied to
wrong keyblock on undo
2010-06-21 20:10:59 +00:00
Campbell Barton
72d21c35ad sequencer swap data operator.
needed for durian so we can swap out preview AVI's for EXR sequences.
2010-06-21 17:37:50 +00:00
Joerg Mueller
229b7639e7 Merged revision 29562 from /branches/soc-2010-nexyon. 2010-06-19 10:50:23 +00:00