blender.git
8 years agoMerging r42770 through r42799 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 21 Dec 2011 14:50:05 +0000 (14:50 +0000)]
Merging r42770 through r42799 from trunk into soc-2011-tomato

8 years agoFix linux linking issue with md5 commit.
Brecht Van Lommel [Wed, 21 Dec 2011 14:35:48 +0000 (14:35 +0000)]
Fix linux linking issue with md5 commit.

8 years agoFix #29670: color picker draw issues with RGB values out of soft range.
Brecht Van Lommel [Wed, 21 Dec 2011 13:49:22 +0000 (13:49 +0000)]
Fix #29670: color picker draw issues with RGB values out of soft range.

8 years agoCode refactoring: move MD5 out of imbuf into blenlib.
Brecht Van Lommel [Wed, 21 Dec 2011 13:48:51 +0000 (13:48 +0000)]
Code refactoring: move MD5 out of imbuf into blenlib.

8 years agoCycles: some small code refactoring related to buffer parameters.
Brecht Van Lommel [Wed, 21 Dec 2011 13:48:35 +0000 (13:48 +0000)]
Cycles: some small code refactoring related to buffer parameters.

8 years agoDo not show "Modify" modifiers group for curve objects
Sergey Sharybin [Wed, 21 Dec 2011 13:31:28 +0000 (13:31 +0000)]
Do not show "Modify" modifiers group for curve objects

This commit prevents adding empty groups to Add Modifier menu making
this menu small and nice for objects which don't support all modifiers
from some group (like Curves don't support Modify modifiers).

8 years agoSmall i18n edits:
Bastien Montagne [Wed, 21 Dec 2011 11:56:42 +0000 (11:56 +0000)]
Small i18n edits:
* Added serbian_latin locale (sr@latin).
* Changed serbian UI to  "Serbian (Српски)" (as requested by Nikola Radovanovic, serbian translator).
* Reordered languages in menu in alphabetical order!

8 years agofix for mathutils mat*vec for non sqyare matrices by Andrew Hale
Campbell Barton [Wed, 21 Dec 2011 11:36:28 +0000 (11:36 +0000)]
fix for mathutils mat*vec for non sqyare matrices by Andrew Hale

8 years agoAdded Record run no gaps timecode for movie clips.
Sergey Sharybin [Wed, 21 Dec 2011 11:01:08 +0000 (11:01 +0000)]
Added Record run no gaps timecode for movie clips.
Also get rid of hardcoded constants in readfile and use constants from ImBuf headers.

8 years agoPatch [#29654] New menu option under Object > Game with "Copy All Physics Attributes...
Dalai Felinto [Wed, 21 Dec 2011 02:41:27 +0000 (02:41 +0000)]
Patch [#29654] New menu option under Object > Game with "Copy All Physics Attributes" by Daniel Macedo
"This is a patch that adds an option under the menu Object > Game to copy all the physics attributes from Game Engine."

8 years agotopo mirror and sync with minor edits made to bmesh, no functional changes
Campbell Barton [Tue, 20 Dec 2011 23:14:29 +0000 (23:14 +0000)]
topo mirror and sync with minor edits made to bmesh, no functional changes

8 years agoCycles/CUDA:
Thomas Dinges [Tue, 20 Dec 2011 18:59:10 +0000 (18:59 +0000)]
Cycles/CUDA:
* Rename shader model to compute capability in error messages.

8 years agoCycles: some tweaks for apple opencl with ATI cards, to get it working up to
Brecht Van Lommel [Tue, 20 Dec 2011 17:36:56 +0000 (17:36 +0000)]
Cycles: some tweaks for apple opencl with ATI cards, to get it working up to
the level of ambient occlusion render, shaders still fail. Fixes found with
much help from Jens and Dalai.

8 years agoMerging r42723 through r42769 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 20 Dec 2011 17:24:20 +0000 (17:24 +0000)]
Merging r42723 through r42769 from trunk into soc-2011-tomato

8 years agoNew modifier type: eModifierTypeType_NonGeometrical, for modifiers affecting CustomDa...
Bastien Montagne [Tue, 20 Dec 2011 14:15:59 +0000 (14:15 +0000)]
New modifier type: eModifierTypeType_NonGeometrical, for modifiers affecting CustomData layers only (e.g. UVProject and  WeightVG ones).

Also, allow applying to obdata those modifiers, even with shapekeys, but do not allow applying them *as* shapekey (as shapekeys do not have CD layers).

Fix [#29636] Vertex Weight Mix modifier "apply" button don't work.

Note: applying whit shape keys currently always uses base shape, not current one (for apply to obdata as well as apply to shapekey), but this is another topic...

8 years agoCycles: avoid using float3 in kernel constant memory, just so we're sure alignment
Brecht Van Lommel [Tue, 20 Dec 2011 12:25:45 +0000 (12:25 +0000)]
Cycles: avoid using float3 in kernel constant memory, just so we're sure alignment
is working compatible between cpu and gpu.

8 years agoCycles: border rendering support, includes some refactoring in how pixels are
Brecht Van Lommel [Tue, 20 Dec 2011 12:25:37 +0000 (12:25 +0000)]
Cycles: border rendering support, includes some refactoring in how pixels are
accessed on devices.

8 years agoFix #25775: crash using border render from external render engines, merging
Brecht Van Lommel [Tue, 20 Dec 2011 12:25:18 +0000 (12:25 +0000)]
Fix #25775: crash using border render from external render engines, merging
back the tile used wrong offsets.

8 years agorecent commit missed swapping args for MATRIX_ITEM in mathutils_Vector.c, breaking...
Campbell Barton [Tue, 20 Dec 2011 11:37:55 +0000 (11:37 +0000)]
recent commit missed swapping args for MATRIX_ITEM in mathutils_Vector.c, breaking matrix*vector.

8 years agomove topology mirror out into its own functions - needed for bmesh branch so we can...
Campbell Barton [Tue, 20 Dec 2011 10:05:58 +0000 (10:05 +0000)]
move topology mirror out into its own functions - needed for bmesh branch so we can use then for bmeshes own internal mirror calculations.

8 years agoFix a small typo-bug in UVProject modifier (using v3 instead of v4 to detect tri...
Bastien Montagne [Tue, 20 Dec 2011 09:57:01 +0000 (09:57 +0000)]
Fix a small typo-bug in UVProject modifier (using v3 instead of v4 to detect tri/quad faces). Seems it was harmless, though...

8 years agoGet rid of hardcoded structure definition in DM drawing callbacks
Sergey Sharybin [Tue, 20 Dec 2011 08:47:36 +0000 (08:47 +0000)]
Get rid of hardcoded structure definition in DM drawing callbacks

Structures passing to DM callbacks as userData used to be defined in both callee
and callbacks itself which made it difficult and unsafe to add new properties
to user data.

Added typedefs for this structures and use them in callbacks and callee functions.

8 years agoCleaning up some issues that found their way into the python ui files with the first...
Daniel Stokes [Tue, 20 Dec 2011 07:39:30 +0000 (07:39 +0000)]
Cleaning up some issues that found their way into the python ui files with the first Cucumber merge.

8 years agoFirst fix after Cucumber merge starts.
Thomas Dinges [Tue, 20 Dec 2011 06:26:03 +0000 (06:26 +0000)]
First fix after Cucumber merge starts.
* Restore COMPAT_ENGINES for particle panel, caused error on startup. (Cycles needs it)

8 years agopatch [#29662] Modifications to Mathutils Vectors for Consistency with Commit 42752
Campbell Barton [Tue, 20 Dec 2011 05:48:35 +0000 (05:48 +0000)]
patch [#29662] Modifications to Mathutils Vectors for Consistency with Commit 42752
from Andrew Hale

8 years agorename internal matrix struct member vars to avoid confusion
Campbell Barton [Tue, 20 Dec 2011 04:11:23 +0000 (04:11 +0000)]
rename internal matrix struct member vars to avoid confusion

Matrix.contigPtr --> matrix
Matrix.row_size --> num_col
Matrix.col_size --> num_row

8 years ago__str__ functions for other mathutils types
Campbell Barton [Tue, 20 Dec 2011 03:37:55 +0000 (03:37 +0000)]
__str__ functions for other mathutils types

8 years agoCucumber, first batch of merge - UI changes and custom exit key
Dalai Felinto [Tue, 20 Dec 2011 03:11:56 +0000 (03:11 +0000)]
Cucumber, first batch of merge - UI changes and custom exit key
---------------------------------------------------------------
This was a test drive to see how painful the merge will be.
Next batches are:
- use desktop option for fullscreen
- multisampling option
- bullet collision mask
- python
- storage (vbo, dl, ...)
- lighting

[lighting still needs review]
[python could use review, although it should be straightforward]
[storage should be tested more I think]

Merged /branches/soc-2011-cucumber:r
36991,37059,37157,37416,37497-37499,37501,37522,39036,40593

36991:
==UI==
* Made some options available in Blender Game that were only available in Blender Render (camera resolution, animation fps)
* Created a panel for the embedded player
* Renamed the FPS option for the standalone player to Refresh Rate
* Moved framing options to display
* Made a button to launch the blender player from within blender (only tested on windows for now)

37059:
==UI==
* Added the option to change the exit key for the BGE. The UI currently just sets a number, and this feature most likely does not work for blenderplayer yet. More work on this to come.
* Removed the physics settings from the scene panel for the BGE.
* Added an Add menu in the logic brick header.

37157:
Making the bake options available in Blender Game

37416:
Making the exit key UI element accept key presses instead of numbers. It still does not work for the Blenderplayer, and it does not limit the input to key presses (other events don't work for exiting)

37497:
Some more work on getting the exit key to work in the Blenderplayer.
Input is now restricted to keyboard events only for the exit key UI.
37498:
Some clean up from the last commit.
The exit key setting affects the Blenderplayer now.
37499:
Cleaning up some duplicate code. Now the reverseTranslateTable for converting blender key codes to ketsji key codes is only defined in BL_BlenderDataConverter.
37501:
Centralizing the exit key methods to the keyboard devices. This should make it easier to get exit key control to the python API.

[37517: committed previously]

37522:
Moved control of the exit key away from the keyboard devices, and moved it to ketsjiengine.
Added setExitKey and getExitKey to the python API

39036:
A couple of the doversions were in the wrong spot. This should fix some issues with the exit key not being set.
[not committed entirely, see below]]

40552: space_logic.py (* fixed an error in space_logic.py *)

40593:
launch blenderplayer from ui not working in OSX fix - by Daniel Stokes and me

########################################################
code left behind (to be included in next commit):
########################################################
{
/* Initialize default values for collision masks */
Object *ob;
for(ob=main->object.first; ob; ob=ob->id.next)
ob->col_group = ob->col_mask = 1;
}

8 years agopatch [#29651] Add a __str__ Method to Matutils Matrices so print(matrix) Shows Colum...
Campbell Barton [Tue, 20 Dec 2011 02:54:25 +0000 (02:54 +0000)]
patch [#29651] Add a __str__ Method to Matutils Matrices so print(matrix) Shows Columns as Columns
from Andrew Hale

converted from python string formatting to using BLI_dynstr

8 years agominor edits to previous commit & set VKey to toggle vertex select in weight paint...
Campbell Barton [Tue, 20 Dec 2011 02:04:35 +0000 (02:04 +0000)]
minor edits to previous commit & set VKey to toggle vertex select in weight paint mode.

8 years agounit test for mathutils python module from Andrew Hale, runs in CTest too
Campbell Barton [Tue, 20 Dec 2011 01:49:24 +0000 (01:49 +0000)]
unit test for mathutils python module from Andrew Hale, runs in CTest too

8 years agoPatch #27085, Restore old 2.49 TAB behaviour for window splitting, by Andre Oliveira
Michael Fox [Tue, 20 Dec 2011 00:46:55 +0000 (00:46 +0000)]
Patch #27085, Restore old 2.49 TAB behaviour for window splitting, by Andre Oliveira

Now this patch only applies to RMB window splitting not the click and drag as that would cause confusion and big mess

8 years agopatch [#28094] New equirectangular world texture mapping option
Campbell Barton [Mon, 19 Dec 2011 23:52:17 +0000 (23:52 +0000)]
patch [#28094] New equirectangular world texture mapping option

8 years agocalculate weight paint colors once per vertex rather then on every face corner (was...
Campbell Barton [Mon, 19 Dec 2011 22:55:04 +0000 (22:55 +0000)]
calculate weight paint colors once per vertex rather then on every face corner (was doing the same deform vert lookup and color calculation multiple times per vertex),

Quick shows over 2x speedup in my tests, will give bigger speedup with more vertex groups.

If you happen to have vertices with no faces using them - vertex colors will be calculated unnecessarily, but this isnt a common use case for weight paint mode.

8 years ago* Changes for static win32 png libs.
Thomas Dinges [Mon, 19 Dec 2011 19:46:07 +0000 (19:46 +0000)]
* Changes for static win32 png libs.

8 years agoObject tracking: configurable scale for object solution
Sergey Sharybin [Mon, 19 Dec 2011 15:12:33 +0000 (15:12 +0000)]
Object tracking: configurable scale for object solution

Added slider to define scale of object solution which is used to define
"depth" of object relative to camera position. This slider effects on all
"users" of object solution such as bundles display, constrained objects and so.

Added new operator called "Set Solution Scale" to set real scale for object
solution based on real distance between two bundles reconstructed for this object.

New slider and operator can be found on "Object" panel in toolbox when in
reconstruction mode and active tracking object isn't a camera.

8 years ago* Fix for moving mingw png libs.
Thomas Dinges [Mon, 19 Dec 2011 14:46:17 +0000 (14:46 +0000)]
* Fix for moving mingw png libs.

8 years agoFix #29653: fix wrong cycles depth of field distance when rendering with a
Brecht Van Lommel [Mon, 19 Dec 2011 14:23:24 +0000 (14:23 +0000)]
Fix #29653: fix wrong cycles depth of field distance when rendering with a
scaled camera.

8 years agoFix #29655: keyboard shortcuts missing from text editor text menu, and removed
Brecht Van Lommel [Mon, 19 Dec 2011 14:23:19 +0000 (14:23 +0000)]
Fix #29655: keyboard shortcuts missing from text editor text menu, and removed
confirmation popup for creating new text datablock.

8 years agoOS X: add BLENDER_SOFTWAREGL environment variable to force using software OpenGL
Brecht Van Lommel [Mon, 19 Dec 2011 14:23:08 +0000 (14:23 +0000)]
OS X: add BLENDER_SOFTWAREGL environment variable to force using software OpenGL
renderer, for debugging OpenGL issues.

8 years agoMuch cleaner and satisfying code in weightvg modifiers' "init": copy only the CD_DEFO...
Bastien Montagne [Mon, 19 Dec 2011 14:09:36 +0000 (14:09 +0000)]
Much cleaner and satisfying code in weightvg modifiers' "init": copy only the CD_DEFORMVERT data layer (if it's the org one), and not the whole DerivedMesh!

Quite oddly, for Proximity mod, this increases the performances of the apply func (about 20-25%, e.g. from 0.04 to 0.03 sec), but decreases the global framerate (e.g. in TEST_5 scene of testing file, I lose about 7%, from 4.6 to 4.3fps (open ATI driver)...).

8 years agoAutomatically hide unused (=unlinked) node sockets in collapsed ("hidden") nodes...
Lukas Toenne [Mon, 19 Dec 2011 12:04:05 +0000 (12:04 +0000)]
Automatically hide unused (=unlinked) node sockets in collapsed ("hidden") nodes. This is to make nodes with many sockets cleaner and simpler, which is the purpose of collapsing nodes in the first place.

The hiding code uses the SOCK_IN_USE flags already present. These were only temporarily set by the shader node code for determining needed texture coordinate types. Now they are used persistently and updated along with the sock->link pointers.

8 years agoDisplay button for hiding unused node sockets in the side bar, as an alternative...
Lukas Toenne [Mon, 19 Dec 2011 11:55:35 +0000 (11:55 +0000)]
Display button for hiding unused node sockets in the side bar, as an alternative to the removed node header button.

8 years agoMerging r42648 through r42722 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 19 Dec 2011 10:39:40 +0000 (10:39 +0000)]
Merging r42648 through r42722 from trunk into soc-2011-tomato

8 years agoFix a bug in CustomData_duplicate_referenced_layer(_named) functions: MEM_dupallocN...
Bastien Montagne [Mon, 19 Dec 2011 08:26:53 +0000 (08:26 +0000)]
Fix a bug in CustomData_duplicate_referenced_layer(_named) functions: MEM_dupallocN does not work with complex layers like CD_MDEFORMVERT ones, so rather use copy func when available.

8 years agocorrections to some comments
Campbell Barton [Mon, 19 Dec 2011 05:23:52 +0000 (05:23 +0000)]
corrections to some comments

8 years ago- mathutils matrix creation - use memcpy rather than copying every matrix row/col...
Campbell Barton [Mon, 19 Dec 2011 05:14:09 +0000 (05:14 +0000)]
- mathutils matrix creation - use memcpy rather than copying every matrix row/col individually.
- creating a new non-square matrix would use uninitialized memory.

8 years agoremove mathutils internal variable for storing pointers to each matrix row, instead...
Campbell Barton [Mon, 19 Dec 2011 03:12:10 +0000 (03:12 +0000)]
remove mathutils internal variable for storing pointers to each matrix row, instead use macros to access row/column's.

also add an assert so invalid index access will raise an error in debug mode, without this it was quite easy to access invalid memory without meaning to.

no functional change.

8 years agochange BLI_assert() so it can be included in other defines.
Campbell Barton [Mon, 19 Dec 2011 03:06:44 +0000 (03:06 +0000)]
change BLI_assert() so it can be included in other defines.

8 years agoFix for cmake for recent mingw png lib move.
Thomas Dinges [Sun, 18 Dec 2011 23:32:24 +0000 (23:32 +0000)]
Fix for cmake for recent mingw png lib move.

8 years agoMinGW png libs
Thomas Dinges [Sun, 18 Dec 2011 23:23:09 +0000 (23:23 +0000)]
MinGW png libs
* Moved to gcc/png in the libs dir.

8 years agoremove unneeded NULL check in ui_searchbox_create() which confuses static checkers...
Campbell Barton [Sun, 18 Dec 2011 22:42:43 +0000 (22:42 +0000)]
remove unneeded NULL check in ui_searchbox_create() which confuses static checkers since the values used later.

8 years agoremove windows only benchmark functions, use PIL_time.h's TIMEIT macros instead.
Campbell Barton [Sun, 18 Dec 2011 22:35:52 +0000 (22:35 +0000)]
remove windows only benchmark functions, use PIL_time.h's TIMEIT macros instead.

8 years agoMinor tweaking to WeightVGProximity modifier code (not really usefull currently,...
Bastien Montagne [Sun, 18 Dec 2011 21:46:26 +0000 (21:46 +0000)]
Minor tweaking to WeightVGProximity modifier code (not really usefull currently, but mandatory for other future changes…)

8 years agoObject tracking: scale object itself when setting scale in object tracking mode
Sergey Sharybin [Sun, 18 Dec 2011 18:31:02 +0000 (18:31 +0000)]
Object tracking: scale object itself when setting scale in object tracking mode

Also fixed incorrect poll functions which didn't check active object when orienting object.

8 years agoObject tracking: forgot to initialize inverted matrix for object solver constraint
Sergey Sharybin [Sun, 18 Dec 2011 18:03:20 +0000 (18:03 +0000)]
Object tracking: forgot to initialize inverted matrix for object solver constraint

8 years agoRemoved buttons in node headers for hiding unused sockets and for hiding the (non...
Lukas Toenne [Sun, 18 Dec 2011 17:59:04 +0000 (17:59 +0000)]
Removed buttons in node headers for hiding unused sockets and for hiding the (non-socket) option buttons. These are rarely used buttons that only complicate the UI. Alternatively these operators can still be accessed in the Node menu of the node editor window, "Toggle Hidden Node Sockets" and "Toggle Node Options" respectively.

8 years agoGeneralized node groups for Cycles.
Lukas Toenne [Sun, 18 Dec 2011 15:34:06 +0000 (15:34 +0000)]
Generalized node groups for Cycles.

This allows group nodes inside other group nodes in cycles and makes the
code more generic for all possible cases, like direct group
input-to-output links and unused group sockets.

Previous code tried to connect external nodes and internal group sockets
by following links until a "real" node input/output. This quickly
becomes complicated in corner cases as described above and can lead to
unexpected behavior when the group socket is of a different type than
the internal/external sockets, but that conversion is skipped.

The new code uses the concept of "proxy nodes" similar to what the new
compositor does. Each group socket is replaced with a proxy node with a
single input and output, to which other nodes in the same tree and
internal nodes can link to. After all groups have been expanded in the
graph, these proxy nodes are removed again, adding converter nodes if
necessary.

8 years agocleanup of weight paint color setting code, no functional changes
Campbell Barton [Sun, 18 Dec 2011 12:54:50 +0000 (12:54 +0000)]
cleanup of weight paint color setting code, no functional changes

8 years agoFix for toggle buttons in node headers.
Lukas Toenne [Sun, 18 Dec 2011 12:51:50 +0000 (12:51 +0000)]
Fix for toggle buttons in node headers.

The buttons for "hiding" (collapsing) a node, hiding unlinked sockets, additional options, the preview and for opening a node group were all using a custom mouse test function, which was broken. They now use actual buttons instead of just displaying icons. Before executing the respective operators the button's node has to be selected and activated, so the buttons use an intermediate handle function, which selects the node and then calls the operator.

8 years ago- remove rna access to deprecated sequencer attributes x/y offset & zoom.
Campbell Barton [Sun, 18 Dec 2011 09:36:47 +0000 (09:36 +0000)]
- remove rna access to deprecated sequencer attributes x/y offset & zoom.
- Object.to_mesh was still using deprecated colbits variable (object material wouldnt work for any material after 16)
- dont set colbits when setting material slot anymore.

8 years agoformatting edits in py api, no functional changes
Campbell Barton [Sun, 18 Dec 2011 08:50:06 +0000 (08:50 +0000)]
formatting edits in py api, no functional changes

8 years agoSupport for arbitrary sized vectors - (was limited by 2-4 previously)
Campbell Barton [Sun, 18 Dec 2011 07:27:11 +0000 (07:27 +0000)]
Support for arbitrary sized vectors - (was limited by 2-4 previously)

patch http://codereview.appspot.com/5482043
from Andrew Hale

* Text from the submission *

This patch adds the ability to use arbitrary sized vectors from mathutils.
Currently vectors are only of size 2, 3 or 4 since they are generally restricted
to geometric applications. However, we can use arbitrary sized vectors for
efficient calculations and data manipulation.

8 years agobugfix: [#29486] 2D filters make scene disappear when wire material used - patch...
Dalai Felinto [Sat, 17 Dec 2011 21:23:02 +0000 (21:23 +0000)]
bugfix: [#29486] 2D filters make scene disappear when wire material used - patch by Juha Mäki-Kanto
when last drawn material is wire it will not set back to face drawing.

8 years agoQuite some compiler warnings...
Bastien Montagne [Sat, 17 Dec 2011 16:22:08 +0000 (16:22 +0000)]
Quite some compiler warnings...

8 years agobetter to generate the library string always because it could lead to null pointer...
Antony Riakiotakis [Sat, 17 Dec 2011 13:02:31 +0000 (13:02 +0000)]
better to generate the library string always because it could lead to null pointer dereferences. I don't have a non-shader system to check so skipping the conditional just to be safe

8 years agomove GPU_code_generate_glsl_lib to GPU_extensions_init. This makes more sense as...
Antony Riakiotakis [Sat, 17 Dec 2011 12:58:20 +0000 (12:58 +0000)]
move GPU_code_generate_glsl_lib to GPU_extensions_init. This makes more sense as we cleanup the library string in GPU_extensions_exit. Thanks to Mitchel Stokes for reporting and proposing this

8 years agoCalculation of the center and normal for sculpting would ignore whether the sculpting...
Jason Wilkins [Sat, 17 Dec 2011 03:49:39 +0000 (03:49 +0000)]
Calculation of the center and normal for sculpting would ignore whether the sculpting tool is using the current vertex positions/normals or the positions/normals from before the current edit.  Most of the time this will lead to subtle and hard to predict differences from what a user might expect.  There was sum testing and discussion about at the end of last summer and even some screen shots showing the difference.  I'm going to go ahead and apply this since I do not think it is controversial.

8 years agouse 2d copy functions with UV's in more places.
Campbell Barton [Sat, 17 Dec 2011 03:46:38 +0000 (03:46 +0000)]
use 2d copy functions with UV's in more places.

8 years agoCode cleanup: fix a few warnings (>= 0 and == -1 tests on unsigned types).
Brecht Van Lommel [Sat, 17 Dec 2011 01:13:02 +0000 (01:13 +0000)]
Code cleanup: fix a few warnings (>= 0 and == -1 tests on unsigned types).

8 years agostyle edit only - move parenthesis onto second line of function definition (in keepin...
Campbell Barton [Sat, 17 Dec 2011 00:52:36 +0000 (00:52 +0000)]
style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code)

also split some long lines in own code.

8 years agoAutomatically update sound animation cache when doing a mixdown.
Joerg Mueller [Sat, 17 Dec 2011 00:22:15 +0000 (00:22 +0000)]
Automatically update sound animation cache when doing a mixdown.

8 years agoFix #29640: make duplicates release keep hierarchy and parent properties not
Brecht Van Lommel [Fri, 16 Dec 2011 23:56:18 +0000 (23:56 +0000)]
Fix #29640: make duplicates release keep hierarchy and parent properties not
working for multiple objects.

ID.newid only worked for one object, now it uses a hash instead.

8 years agoFix #27847: sequencer scene strip rendering crash, due to use of freed
Brecht Van Lommel [Fri, 16 Dec 2011 22:45:29 +0000 (22:45 +0000)]
Fix #27847: sequencer scene strip rendering crash, due to use of freed
RenderResult.rect. Sergey did all the work to track this down, I'm just
committing a slighty different fix.

8 years agoFix use of deprecated im_type member in quicktime export.
Brecht Van Lommel [Fri, 16 Dec 2011 22:33:22 +0000 (22:33 +0000)]
Fix use of deprecated im_type member in quicktime export.

8 years agoFix #29569: region expander widget drawing poorly antialiased.
Brecht Van Lommel [Fri, 16 Dec 2011 22:00:53 +0000 (22:00 +0000)]
Fix #29569: region expander widget drawing poorly antialiased.

8 years agoCycles Gamma Node
Dalai Felinto [Fri, 16 Dec 2011 20:35:06 +0000 (20:35 +0000)]
Cycles Gamma Node
Node specially useful for Texture correction.

This is also a nice example of a simple node made from scratch in case someone wants to create their custom nodes.
Review by Brecht.

8 years agoMath lib: matrix multiplication order fix for two functions that were
Brecht Van Lommel [Fri, 16 Dec 2011 19:53:12 +0000 (19:53 +0000)]
Math lib: matrix multiplication order fix for two functions that were
inconsistent with similar functions & math notation:

mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B)
mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B)

For branch maintainers, it should be relatively simple to fix things manually,
it's also possible run this script after merging to do automatic replacement:
http://www.pasteall.org/27459/python

8 years agoNormal Node - Cycles
Dalai Felinto [Fri, 16 Dec 2011 18:15:07 +0000 (18:15 +0000)]
Normal Node - Cycles
reviewed by Brecht, with help from Lukas.

Note: dot is reversed compared to Blender.
In Blender Normals point outside, while in Cycles they point inside.
If you use your own custom vector with the Normal Node you will see a difference.
If you feed it with object normals it should work just as good.

8 years agode-duplicate parent loop checking function
Campbell Barton [Fri, 16 Dec 2011 10:39:43 +0000 (10:39 +0000)]
de-duplicate parent loop checking function

8 years agoremove duplicate if'0'd functions, same versions are in drawarmature.c.
Campbell Barton [Fri, 16 Dec 2011 10:30:53 +0000 (10:30 +0000)]
remove duplicate if'0'd functions, same versions are in drawarmature.c.
also added note of function to de-duplicate.

8 years agoFixed incorrect usage of enum as integer
Sergey Sharybin [Fri, 16 Dec 2011 10:18:59 +0000 (10:18 +0000)]
Fixed incorrect usage of enum as integer

8 years agostatic functions for getting power of 2 values were being copied about too much,...
Campbell Barton [Fri, 16 Dec 2011 09:25:07 +0000 (09:25 +0000)]
static functions for getting power of 2 values were being copied about too much, add to the BLI_math api.
- is_power_of_2_i
- power_of_2_min_i
- power_of_2_max_i

8 years agoFixed point cache subframe interpolation issue.
Miika Hamalainen [Fri, 16 Dec 2011 09:22:28 +0000 (09:22 +0000)]
Fixed point cache subframe interpolation issue.

Point cache interpolation was using too early start frame in cases when target frame was a subframe. This appeared as random ghost particles when rendering particle animation with full sample motion blur enabled.

8 years agominor cleanup to mirror code
Campbell Barton [Fri, 16 Dec 2011 07:27:56 +0000 (07:27 +0000)]
minor cleanup to mirror code
- MirrTopoPair.hash was 'long' when only needed to be 'int'
- use 'intptr_t' rather than 'long' when the value is cast back to a pointer.

8 years agofix [#29620] Topology Mirror: not refreshing vertex UUIDs
Campbell Barton [Fri, 16 Dec 2011 04:01:08 +0000 (04:01 +0000)]
fix [#29620] Topology Mirror: not refreshing vertex UUIDs

8 years agofix [#29626] Warp tool: stuck Angle value
Campbell Barton [Fri, 16 Dec 2011 03:45:44 +0000 (03:45 +0000)]
fix [#29626] Warp tool: stuck Angle value

8 years agofix own error [#29631] frame is lost from driver namespace after reload
Campbell Barton [Fri, 16 Dec 2011 03:06:56 +0000 (03:06 +0000)]
fix own error [#29631] frame is lost from driver namespace after reload

8 years agofix [#29635] Attempts to import the site module are met with a TypeError exception.
Campbell Barton [Fri, 16 Dec 2011 00:06:01 +0000 (00:06 +0000)]
fix [#29635] Attempts to import the site module are met with a TypeError exception.

8 years agoCamera tracking: follow track + 3d position now respects camera orientation and objec...
Sergey Sharybin [Thu, 15 Dec 2011 20:38:45 +0000 (20:38 +0000)]
Camera tracking: follow track + 3d position now respects camera orientation and object offset

8 years agoCamera tracking: add camera to follow track and object solver constraint
Sergey Sharybin [Thu, 15 Dec 2011 20:38:23 +0000 (20:38 +0000)]
Camera tracking: add camera to follow track and object solver constraint

Object used to be parented to active camera which isn't very convenient when
working with witness cameras.

Now parent camera can be specified in constraint (if it's not specified, active camera is used)

8 years agoCURVE_OT_extrude doesn't have type property, not sure where it came from here.
Sergey Sharybin [Thu, 15 Dec 2011 19:32:57 +0000 (19:32 +0000)]
CURVE_OT_extrude doesn't have type property, not sure where it came from here.

8 years agoObject tracking: various fixes and improvements
Sergey Sharybin [Thu, 15 Dec 2011 16:10:49 +0000 (16:10 +0000)]
Object tracking: various fixes and improvements

- Bundles selection is now available for object's bundles
- If bundles selection wasn't changed in 3D viewport, fallback to regular
  object selection, so objects behind bundles can be selected
- Snap cursor to selection now respects object's bundle selection
- Object and rack name now can be selected from list in constraint settings
- Added preset for tracks used for object tracking

8 years agoObject tracking fixes:
Sergey Sharybin [Thu, 15 Dec 2011 16:10:13 +0000 (16:10 +0000)]
Object tracking fixes:
- Do not draw bundles for object for opengl selection
- Display reconstruction info for active object in cache line and graph editor

8 years agoObject tracking: object with object solver constraint is now parented to scene's...
Sergey Sharybin [Thu, 15 Dec 2011 16:09:57 +0000 (16:09 +0000)]
Object tracking: object with object solver constraint is now parented to scene's camera

Made Object Solver operator parent object to scene's camera. Behavior is pretty much
familiar to Child Of constraint -- it stores inverted transformation matrix which gives
constant offset in parent's space.
Current files would open incorrect, to make object aligned well again, just press
"Set Inverse" button in Object Solver constraint.
Fixed orientation operators so now they should work in all cases.
Also changed behavior of Set Origin operator which now sets origin to the median
point of all selected tracks/

8 years agoMerging r42621 through r42647 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 15 Dec 2011 16:04:59 +0000 (16:04 +0000)]
Merging r42621 through r42647 from trunk into soc-2011-tomato

8 years agoreenabled auto scale for derivative maps
Morten Mikkelsen [Thu, 15 Dec 2011 15:48:44 +0000 (15:48 +0000)]
reenabled auto scale for derivative maps

8 years agoBicubic bump map filtering.
Antony Riakiotakis [Thu, 15 Dec 2011 13:58:09 +0000 (13:58 +0000)]
Bicubic bump map filtering.

This commit introduces bicubic bump map capabilities for the viewport for OpenGL 3.0+ capable GPUs.

To use the functionality change the bump mapping method to "best quality"
Previous "best quality" setting becomes "medium quality" now.
For non OpenGL 3.0 GPUs this becomes the same as "medium quality"

Also:
* added tooltip descriptions to the bump method settings.
* modified the shader to ommit extraneous matrix multiplications for matrices already provided by OpenGL.

Bicubic shader by Morten Mikkelsen. Thanks a lot!

Oh...and FIRST!

8 years agoBCon 1: Alpha, new features, fun and fixes again! :)
Thomas Dinges [Thu, 15 Dec 2011 13:41:29 +0000 (13:41 +0000)]
BCon 1: Alpha, new features, fun and fixes again! :)

8 years agoFix #29233: Windows accessibility feature "sticky keys" for disabled people not working.
Brecht Van Lommel [Thu, 15 Dec 2011 13:01:01 +0000 (13:01 +0000)]
Fix #29233: Windows accessibility feature "sticky keys" for disabled people not working.