Commit Graph

211 Commits

Author SHA1 Message Date
Campbell Barton
e2e5cb881c svn merge ^/trunk/blender -r43117:43124 2012-01-04 12:57:15 +00:00
Sergey Sharybin
388da558ed Camera tracking: fixes in Link Empty to Track and Bundles to Mesh operators
- This operators always used to work with tracks for camera
- Properly set camera and object fields to Follow Track constraint
- TrackingObject.tracks is now pointing to actual list of tracks for
  camera objects.
2012-01-04 09:19:39 +00:00
Sergey Sharybin
76b8b67565 Object tracking: now Object Solver constraint can be converted to F-Curves 2012-01-04 08:43:28 +00:00
Campbell Barton
c0eec8f379 svn merge ^/trunk/blender -r43062:43085 2012-01-03 02:16:52 +00:00
Campbell Barton
77bdef4d22 py scripts - replace bad uses of len(),
checking if the collection is True is faster since it only checks if it has at least one item, rather then going over all items.
2012-01-02 16:18:39 +00:00
Campbell Barton
b64f352270 svn merge ^/trunk/blender -r43033:43062 2012-01-02 02:57:36 +00:00
Campbell Barton
a49e80c48a use props all over for operator properties vars 2012-01-01 13:09:58 +00:00
Campbell Barton
c99975e24f pep8 edits 2012-01-01 08:52:54 +00:00
Campbell Barton
418d66242f theme import/export - uses generic rna_xml py module. 2012-01-01 08:12:51 +00:00
Campbell Barton
81f5c9ed9b svn merge ^/trunk/blender -r42991:43009 2011-12-31 03:07:14 +00:00
Campbell Barton
a8b19260cf check for presets in addons dirs. this way addons can install their own presets too. 2011-12-30 08:39:40 +00:00
Campbell Barton
4ced91da47 svn merge ^/trunk/blender -r42778:42839 2011-12-23 08:41:53 +00:00
Campbell Barton
e7fb276e29 picky edits - use "" for non enum strings. 2011-12-22 03:56:21 +00:00
Bastien Montagne
fbc8362597 A few small fixes to new UI messages... 2011-12-21 18:18:36 +00:00
Campbell Barton
84b58df85a svn merge ^/trunk/blender -r42742:42757 2011-12-20 08:09:46 +00:00
Dalai Felinto
32b23b9f74 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;
		}
2011-12-20 03:11:56 +00:00
Campbell Barton
8115753fd2 svn merge ^/trunk/blender -r42564:42586 2011-12-12 21:01:39 +00:00
Campbell Barton
5600cf9dd9 not all filepaths had the FILE_PATH subtype, this means using non utf8 paths would give errors. 2011-12-11 21:23:29 +00:00
Sergey Sharybin
357c3a14d9 Set lens settings to blender's camera on "Setup Tracking Scene" operator
Helps in cases camera was removed from scene after solve before setting scene up.
2011-12-11 15:48:15 +00:00
Campbell Barton
65f3b93f14 svn merge ^/trunk/blender -r42521:42550 2011-12-10 05:38:00 +00:00
Campbell Barton
2827f57f62 global is python keyword so cant use as operator argument,
also ran operator cheat sheet and made sure no syntax errors.

+ minor pep8 edits.
2011-12-09 10:19:11 +00:00
Daniel Salazar
fbdb8b414d [#29509] Randomize rotations fails with Axis/Angle
Fix based on Brecht's idea: use Blender's conversion from quat or axis angle to euler and back. Euler rotations are left alone so their rotation order is respected
2011-12-09 06:21:26 +00:00
Campbell Barton
980e68175b svn merge ^/trunk/blender -r42495:42516 2011-12-08 17:32:37 +00:00
M.G. Kishalmi
7797c1dc42 randomize transform operators 'rotation' property subtype changed
from TRANSLATION to EULER and tweaks needed along with that.
2011-12-08 15:55:49 +00:00
Campbell Barton
35e80c5544 svn merge ^/trunk/blender -r42439:42466 2011-12-06 18:50:45 +00:00
Campbell Barton
04464c6cf9 more minor py edits 2011-12-05 23:05:16 +00:00
Campbell Barton
b44c82b4fd remove invalid NULL checks from own recent commit and minor pep8 edits. 2011-12-05 22:19:30 +00:00
Campbell Barton
cdc8b33111 svn merge ^/trunk/blender -r42422:42426 2011-12-04 23:39:01 +00:00
Daniel Salazar
577730daad 2011-12-04 22:48:23 +00:00
Campbell Barton
9e5b28cd42 svn merge ^/trunk/blender -r42261:42290 2011-11-30 09:31:11 +00:00
Sergey Sharybin
377d5232d4 Rename Movie to Movie Clip source for background image 2011-11-30 05:34:32 +00:00
Sergey Sharybin
8bff756974 Reverting previous ZCombine commit.
ZCombine solves particular cases only and confused other cases.
2011-11-29 20:36:34 +00:00
Campbell Barton
faa022563d svn merge ^/trunk/blender -r42245:42261 2011-11-29 18:18:56 +00:00
Sergey Sharybin
1ec4ceac7e Added Z-Combine node to default tracking scene setup 2011-11-29 17:41:15 +00:00
Campbell Barton
063dd4f60a svn merge ^/trunk/blender -r42197:42221 2011-11-28 17:09:13 +00:00
Sergey Sharybin
a3623a046b Camera tracking: merging tracking presets stuff from tomato branch
This commit implements:

- Configurable settings for newly creating tracks
  Now it's possible to set tracking algorithm and it's settings for
  all newly creating tracks including manual tracks creation and
  tracks creation by "Detect Features" operator.
- Moves margin, frames limit and adjust frame inside per-track
  settings.
  Was request from Francois for this.
- Adjust Frames replaced with menu called Pattern Match where it's
  possible to choose between matching pattern from keyframe frame
  or from previously tracked frame.
  Didn't see somebody used adjust frames values differ from 0 and 1,
  and this menu should make things more clear here/
2011-11-28 13:26:46 +00:00
Campbell Barton
3b5bcab09c svn merge ^/trunk/blender -r42139:42172 2011-11-26 16:29:14 +00:00
Campbell Barton
f8affbb980 skip importing shutil on load. 2011-11-24 21:59:43 +00:00
Campbell Barton
f28fd56f8f svn merge ^/trunk/blender -r42095:42116 2011-11-24 05:33:22 +00:00
Sergey Sharybin
fe6a240111 Camera tracking: operator to setup scene for compositing things into footage
This operator does needed changes to

- 3D viewport
- Scene settings
- World settings
- Compositor
- Scene objects

in a way scene becomes ready to be composited into footage.

Known issue: preview doesn't work "out-of-box" after running this script,
selecting View node and hitting Tab helps. Not sure it can be solved
in nicer way at this moment.
2011-11-23 17:30:47 +00:00
Brecht Van Lommel
2345efc6c5 Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface,
by Gaia Clary.

Rationale: the name was confusing and not always used consistently, and this
map itself is not something that can be layered, rather the map can be used
as texture coordinates in some layered setup.

The original intent was to indicate this contained more than just UV's, but
the game engine settings have already been moved out, and apparently users
didn't really get this from the name anyway.
2011-11-23 17:25:25 +00:00
Campbell Barton
f9e00b5c99 svn merge ^/trunk/blender -r42009:42053 2011-11-22 11:51:42 +00:00
Sergey Sharybin
697e4d2ca7 Last part of camera tracking names cleanup: bundles -> 3d markers 2011-11-21 17:05:27 +00:00
Campbell Barton
8eb41f0fdb svn merge ^/trunk/blender -r41998:42009 2011-11-20 16:05:51 +00:00
Sergey Sharybin
57e75591b6 Tweaks in convert tracking constraint to f-curves operator. 2011-11-20 11:44:32 +00:00
Campbell Barton
3c8d86e117 svn merge ^/trunk/blender -r41961:41998 2011-11-20 01:14:33 +00:00
Sergey Sharybin
120c0659ed Camera tracking fixes:
- Fixed incorrect memory access on distoritons more than 128 pixels
- Do not use UNDO operators flags for delete proxy operator (files can't be restored form disk),
  and also do not use UNDO for set as background operator (background images are storing in
  3d viewport which isn't getting re-loaded on undo which can lead to incorrect users count
  of movie clip user).
2011-11-19 20:14:57 +00:00
Sergey Sharybin
cc314e442c Rename bgpic.add() to bgpic.new() to correspond others collections like
render layers, vertices groups and so.
Also added bgpig.remove() function to remove specified picture.
2011-11-18 14:28:45 +00:00
Andrew Wiggin
1038c76c55 Add access to UVs from python, patch python unwrap scripts to work wtih ngons 2011-11-17 05:03:07 +00:00
Campbell Barton
4d9766aacf minor cleanup
- remove / comment unused python vars
- replace mul_v3_fl(somevec, -1.0f); with negate_v3(somevec);
2011-11-16 16:38:37 +00:00