Commit Graph

46014 Commits

Author SHA1 Message Date
Tamito Kajiyama
2d801f2bec Another big code clean-up patch from Bastien Montagne, thanks again! 2013-03-11 06:56:51 +00:00
Tamito Kajiyama
4a92d82626 A big code clean-up patch from Bastien Montagne, many thanks! 2013-03-07 23:17:23 +00:00
Tamito Kajiyama
b4b2269985 Fix for the Sinus Displacement geometry modifier not working properly.
The problem was caused by keeping a reference to a Vector object that is
assumed to be unchanged, but actually altered by the geometry modifier.

The same code updates were made to similar code portions to prevent
possible future bugs.
2013-03-03 21:56:36 +00:00
Tamito Kajiyama
66a2b84897 Merged changes in the trunk up to revision 54992.
Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py
2013-03-03 15:07:49 +00:00
Gaia Clary
4774357b59 Collada: exported normals now based on MPoly instead of MFace 2013-03-03 13:53:32 +00:00
Sergej Reich
ceaf8e48ef rigidbody: Revert to running simulation on frame update
Instead of flagging the rigid body world for frame update just call
BKE_rigidbody_do_simulation() recursively for all scenes.

This avoids having to constantly check if the simulation needs to be
updated.
2013-03-03 06:09:48 +00:00
Sergej Reich
5ff6a5c6ab rigidbody: Fix inconsistency with world rebuilding
The rigid body world could be rebuilt on start frame and one frame after
start frame. The latter was necessary sice animation playback usually
doesn't start at start frame.
This lead to different simulations depending on which frame the
simulaton was rebuilt when animation was involved.

Now we only rebuild the world on start frame.
This is actually tricky to do since, as mentioned above, animation
playback starts on second frame. To work around this we rebuild the
world before the actual update.
The alternative would be to rebuld the world on every simulation change
(like the other simulations do it) but this is an expensive operation
and would be too slow.
2013-03-03 06:09:45 +00:00
Campbell Barton
b390192b70 code cleanup: de-duplicate cast modifier logic, had 'optimization' which was only saving a NULL check per loop, causing most of the logic to be copied, ~130 lines. 2013-03-03 05:43:47 +00:00
Campbell Barton
79e80d8322 code cleanup: ~400 duplicate lines for AO form factor math. 2013-03-03 05:07:58 +00:00
Campbell Barton
b4a1626907 code cleanup: de-duplicate ~75 lines copied twice - tsk tsk. 2013-03-03 04:54:33 +00:00
Campbell Barton
a02c8c4177 move toggle drag into a UI handler (was modal operator) 2013-03-03 03:29:57 +00:00
Tamito Kajiyama
0c5dfc8a63 Fix for exceptions in converting Python float objects to C variables not properly handled.
Based on review comment from Campbell.
2013-03-03 01:53:49 +00:00
Campbell Barton
c6642b8ec8 enable triangulation with collada, disable BLI_STATIC_ASSERT for C++. 2013-03-03 01:24:09 +00:00
Gaia Clary
24437b6171 partial revert of collada triangulation code due to problems on linux 2013-03-02 23:42:03 +00:00
Tamito Kajiyama
39b9d925ee Renamed FreestyleLineSet.use to .show_render.
Based on review comment from Campbell.
2013-03-02 23:30:23 +00:00
Tamito Kajiyama
6e5842e5f8 Code clean-up: used copy_m4_m4() and unit_m4() instead of verbose loops.
Based on review comment from Campbell.
2013-03-02 23:17:35 +00:00
Tamito Kajiyama
f60c5b8e22 Removed redundant definitions of __min and __max macros by replacing them with
std::min() and std::max(), respectively.  Based on review comment from Campbell.
2013-03-02 23:17:20 +00:00
Jens Verwiebe
1c5f18f42b OSX: Get the current locale in objC-style 2013-03-02 22:50:46 +00:00
Tamito Kajiyama
0be5cd051d Moved operations on blend file data from C++ class destructor to a specific method
for releasing resources.  Based on review comment from Campbell.
2013-03-02 22:20:27 +00:00
Gaia Clary
b74c686c66 Fix Collada build error in scons 2013-03-02 20:46:37 +00:00
Tamito Kajiyama
51460e7789 Fix for a buffer overflow, by simply removing the unnecessary string copy.
Review comment from Campbell.
2013-03-02 18:43:06 +00:00
Tamito Kajiyama
6645551aed Removed paths to a browser command and help index that are no longer used in Freestyle for Blender.
Review comment from Campbell.
2013-03-02 18:31:32 +00:00
Tamito Kajiyama
3b953c39c3 Use sys.float_info.max instead of float('inf').
Review comment from Campbell.
2013-03-02 18:27:50 +00:00
Mitchell Stokes
db6d34daad BGE: Fix for bugs #34428, #20856, #20281. These were all multi-uv bugs caused by the BGE keeping too much uv information. When setting up shaders the BGE assumes each UV layer is unique, but the converter would store duplicates. 2013-03-02 18:05:52 +00:00
Campbell Barton
c718f0d658 fix [#34431] Crash with 2.66 when dyntopo enabled and using view plane mode 2013-03-02 16:13:01 +00:00
Gaia Clary
be701b6278 Collada: Added support for ngon export/import and added triangulate option to export 2013-03-02 15:58:13 +00:00
Campbell Barton
723e231ce0 fix [#34486] Selection of bones in armature edit mode only toggles between two bones 2013-03-02 15:34:47 +00:00
Gaia Clary
d17a8639e4 Added typecasts to keep c++ from reporting errors 2013-03-02 12:16:23 +00:00
Campbell Barton
7d5c51a96f now dragging an image onto an empty can be done without holding Ctrl.
Make it set the empty draw type for existing empty object.
change from yakca on IRC

also some whitespace cleanup.
2013-03-02 12:05:25 +00:00
Campbell Barton
8f01b50e14 code cleanup: clarify comment about virtial-modifiers, also add comments to DNA headers when its not so obvious what their purpose is. 2013-03-02 07:27:19 +00:00
Brecht Van Lommel
2822a14e5d Fix #34483: game engine multi UV glsl materials not working correct after changes
to support more than 2 UV maps. This code indirectly depended on the order of
OpenGL attribute ID's assigned by the OpenGL driver being the same as the
attributes being declared in the GLSL shader code, which is not always the case.
2013-03-01 20:45:42 +00:00
Thomas Dinges
70fba54545 UI / World Units:
* Consistency tweak: for properties based on an enum, we hide the buttons and do not grey out. 
Greying out is for properties based on a boolean.
2013-03-01 19:15:32 +00:00
Thomas Dinges
419ff87545 UI / Properties Editor:
* Some alignment fixes for Fluid Buttons in the "Fluid" panel. 
* Tweaked Fluid Particle buttons a bit, no need to have redundant "Particle" name inside the "Fluid Particles" panel.
2013-03-01 19:07:28 +00:00
Thomas Dinges
786387e462 3D View properties region / Mesh Displays panel:
* Made overlays use 2 columns, rather than 1 as suggested by Sebastian König in IRC.
* Small tweak to the Normal size button, grey out if unused.
2013-03-01 18:45:41 +00:00
Ton Roosendaal
f6548d5e6e Bug fix #34418
Fix for 2.66a

Screencast could be started twice in a row, but it then also added two handlers
for drawing an overlay circle around mouse cursor. After ending the screencast,
this circle then kept being drawn.
2013-03-01 17:17:57 +00:00
Sergey Sharybin
f186f89a42 Fix #34461: Inconsistent behavior of "Color Mix Node" and "Alpha Over Node"
Added compatibility option "Straight Alpha Output" to image input node

When this option is enabled, image input node will convert float buffer
to straight alpha.

This is not what you'll usually want with new alpha pipeline, nit this
is needed to preserve compatibility with older files saved in 2.65.
In that version byte image are resulting with straight alpha passing
to the compositor and alpha-overing required extra premultiplication
of inputs.

So, that's why Straight Alpha Output is needed -- it's set in versioning
code for byte node images so they'll still output straight alpha.

This option is currently only available in N-panel.

Additional change: added Alpha Mode for image input node to N-panel.
2013-03-01 15:37:15 +00:00
Brecht Van Lommel
69f746d04c Fix #34480: cycles hair render in dupligroup did hide the emitter properly in some cases. 2013-03-01 14:55:30 +00:00
Campbell Barton
0ac07404ba style cleanup: braces with multi-line statements, also add some comments. 2013-03-01 14:47:06 +00:00
Bastien Montagne
462e4bee87 More tweaks (gaining about ten seconds for each po in update branches process!). 2013-03-01 14:28:38 +00:00
Brecht Van Lommel
41935d10c9 Fix related to #34481: show units for camera aperature radius. 2013-03-01 14:06:20 +00:00
Sergey Sharybin
9da36d3ab1 Updates to libmv's bundle.sh to make sure libmv upstream
is copying properly to our sources.
2013-03-01 11:52:38 +00:00
Ton Roosendaal
032923a9f5 Bug fix #34334
For 2.66a 

Soft shadow was drawing a complete rect, but it should skip the top edge.
That allows transparent menus to still have a shadow too.
2013-03-01 11:42:07 +00:00
Sergey Sharybin
1a7ab1da09 Hrm, gcc became broken after recent commit.
Hope now gcc and 32bit msvc would both work.
2013-03-01 08:56:04 +00:00
Sergey Sharybin
a2027237ed Pass data to modal reprojection cost functor by reference
Seems it solves alignment error reported by 32bit MSVC.
2013-03-01 08:20:13 +00:00
Campbell Barton
2de9ce7940 keymap filter by keybindings in the userpreferences.
- optional, select between name/keybinding.
- when key input can't be parsed, alert red to give the user some feedback.
- key shortcut parsing could be improved or swapped out for button which grabs shortcut.
2013-03-01 06:17:59 +00:00
Campbell Barton
2de8dfd784 fix for drag-toggle, bit-buttons weren't handled which made drag toggle fail for buttons in the graph editor for eg. 2013-03-01 00:35:01 +00:00
Campbell Barton
3d63b2308a code cleanup: minor refactor of button pressed state checking, needed for drag toggle fix. 2013-03-01 00:19:32 +00:00
Thomas Dinges
681b2ec49c Fix / Workaround for [#34474] "Record Composite" image op segfaults in compositor code
* These operators have never been ported to 2.5x and therefore should not come up inside the UI. (as they are not working).
2013-02-28 22:50:24 +00:00
Sergey Sharybin
d7e427beff Fix/workaround for newer FFmpeg 1.1.3 and MP3 decoder
FFmpeg is now using S16P sampler for MP3 which is not actually
supported by audaspace, so request for S16 sampler instead.
2013-02-28 18:28:08 +00:00
Sergey Sharybin
402f2159fa Fix own regression in commit from today -- missing NULL check
Crash happened when sequence image failed to load.
2013-02-28 17:23:44 +00:00