Commit Graph

58 Commits

Author SHA1 Message Date
Campbell Barton
f730e386eb Merge branch 'master' into blender2.8 2017-03-25 13:49:13 +11:00
Campbell Barton
7cb2974182 Cleanup: imports, indentation, long lines 2017-03-25 11:07:48 +11:00
Campbell Barton
3f818c7898 Merge branch 'master' into blender2.8 2017-03-20 09:32:40 +11:00
Campbell Barton
9bdda427e6 PyAPI: remove bpy.utils.register_module()
In preparation for it being removed, see: T47811
2017-03-18 20:03:24 +11:00
Dalai Felinto
aeb8e81f27 Render Layers and Collections (merge from render-layers)
Design Documents
----------------

* https://wiki.blender.org/index.php/Dev:2.8/Source/Layers

* https://wiki.blender.org/index.php/Dev:2.8/Source/DataDesignRevised

User Commit Log
---------------

* New Layer and Collection system to replace render layers and viewport layers.

* A layer is a set of collections of objects (and their drawing options) required for specific tasks.

* A collection is a set of objects, equivalent of the old layers in Blender. A collection can be shared across multiple layers.

* All Scenes have a master collection that all other collections are children of.

* New collection "context" tab (in Properties Editor)

* New temporary viewport "collections" panel to control per-collection
visibility

Missing User Features
---------------------

* Collection "Filter"
  Option to add objects based on their names

* Collection Manager operators
  The existing buttons  are placeholders

* Collection Manager drawing
  The editor main region is empty

* Collection Override

* Per-Collection engine settings
  This will come as a separate commit, as part of the clay-engine branch

Dev Commit Log
--------------

* New DNA file (DNA_layer_types.h) with the new structs
  We are replacing Base by a new extended Base while keeping it backward
  compatible with some legacy settings (i.e., lay, flag_legacy).

  Renamed all Base to BaseLegacy to make it clear the areas of code that
  still need to be converted

  Note: manual changes were required on - deg_builder_nodes.h, rna_object.c, KX_Light.cpp

* Unittesting for main syncronization requirements
  - read, write, add/copy/remove objects, copy scene, collection
  link/unlinking, context)

* New Editor: Collection Manager
  Based on patch by Julian Eisel
  This is extracted from the layer-manager branch. With the following changes:

    - Renamed references of layer manager to collections manager

    - I doesn't include the editors/space_collections/ draw and util files

    - The drawing code itself will be implemented separately by Julian

* Base / Object:
  A little note about them. Original Blender code would try to keep them
  in sync through the code, juggling flags back and forth. This will now
  be handled by Depsgraph, keeping Object and Bases more separated
  throughout the non-rendering code.

  Scene.base is being cleared in doversion, and the old viewport drawing
  code was poorly converted to use the new bases while the new viewport
  code doesn't get merged and replace the old one.

Python API Changes
------------------

```
- scene.layers
+ # no longer exists

- scene.objects
+ scene.scene_layers.active.objects

- scene.objects.active
+ scene.render_layers.active.objects.active

- bpy.context.scene.objects.link()
+ bpy.context.scene_collection.objects.link()

- bpy_extras.object_utils.object_data_add(context, obdata, operator=None, use_active_layer=True, name=None)
+ bpy_extras.object_utils.object_data_add(context, obdata, operator=None, name=None)

- bpy.context.object.select
+ bpy.context.object.select = True
+ bpy.context.object.select = False
+ bpy.context.object.select_get()
+ bpy.context.object.select_set(action='SELECT')
+ bpy.context.object.select_set(action='DESELECT')

-AddObjectHelper.layers
+ # no longer exists
```
2017-02-07 11:11:00 +01:00
Campbell Barton
404f9ddc37 Cleanup: use staticmethods 2015-06-07 17:40:39 +10:00
Campbell Barton
e6ceecdf97 Cleanup: pep8, spelling 2015-04-22 16:26:54 +10:00
Bastien Montagne
00a3c9afc8 UI messages fixes and cleanup. 2015-02-16 20:38:07 +01:00
Sergey Sharybin
6e08aa0a9e Tracking: Expose Filter Tracks operators to the Cleanup panel
Not totally happy with this, but it's better than nothing for until
we've got real outlier detection. Also made it more cleat how exactly
filtering happens, so users don't expect something the operator is not
intended to do.
2015-02-16 17:16:14 +05:00
Campbell Barton
616eb6818f cleanup 2015-02-13 16:17:00 +11:00
Campbell Barton
912b4659ec Tracker operators: filter & copy track settings
D1069 by @sebastian_k
2015-02-13 02:22:39 +11:00
Sergey Sharybin
1ce09ff411 Tracking: Fix ground plane normal facing downwards 2014-09-21 15:55:46 +06:00
Sergey Sharybin
e38152bae4 Tweaks to setup trackign scene in order to fix usability issues
Patch by Sebastian Koenig
2014-09-11 20:00:24 +06:00
Sergey Sharybin
ba8c2be739 Improve behavior of Setup Tracking Scene when default nodes exists in the tree 2014-06-02 13:12:01 +06:00
Sergey Sharybin
6dec250ec6 Fix possible issues when blender is compiled without Cycles 2014-06-02 12:55:05 +06:00
Sergey Sharybin
559e3db792 Keep active layer when setting up tracking scene
When you hit "setup tracking scene" in MCE, the active layer usually switches
to the layer where the ground has been created, thus he shadow layer.

New objects are created or appended on that layer which means they will be
default be rendered as shadows only. This behaviour requires muscle memory
and is confusing for new users. This patch is changing the behaviour in a
way that the active layer is remembered from before setting up the scene.

Patch by gottfried, thanks!

Reviewers: sebastian_k, sergey

Differential Revision: https://developer.blender.org/D574
2014-06-02 12:51:13 +06:00
Campbell Barton
8af2ed80a4 RNA: rename matrix_for_frame -> matrix_from_frame 2014-02-27 08:39:25 +11:00
Sergey Sharybin
3b44ca08a9 Fix 3D tracks to mesh not aligning mesh properly
Also fixed wrong frame number used for reconstructed object
visualization in 3D viewport.
2014-02-26 19:40:04 +06:00
Sergey Sharybin
521b3a5dac Fix for Copy Settings From Active Track
it didn't copy weight from active track.
2014-02-19 18:59:04 +06:00
Sergey Sharybin
daaca80664 Hide preview for nodes created with Setup Tracking Scene 2013-04-11 13:34:51 +00:00
Sergey Sharybin
432a260869 Setup tracking scene shall work with Cycles now 2013-04-11 13:29:51 +00:00
Sergey Sharybin
c6606986cc Fix for Setup Tracking Scene operator
- Ported to new node add operator
- Alpha mode shall be set to Transparent
2013-04-11 13:25:05 +00:00
Campbell Barton
9fa36b12cc style cleanup: pep8 2012-10-08 08:28:05 +00:00
Sergey Sharybin
4f410971c3 Camera tracking presets
- Fix for copy default settings from active track operator
- Add meaningful tracking presets

API changes:

- Added parameter exact to Marker.find_frame, so now it's
  possible to get estimated marker

- Added Marker.pattern_bound_box to get pattern's bound box
2012-08-04 10:47:31 +00:00
Thomas Dinges
0ee0eec6c6 Fix for [#32016] Tracking Settings Presets not working
* Removed outdated properties from the presets.

Note: it does not fail anymore, but needs an update for new settings probably.
2012-07-04 23:00:49 +00:00
Campbell Barton
2a140e93c1 style cleanup 2012-07-04 21:41:05 +00:00
Campbell Barton
01e55b6fc3 code cleanup: remove unused imports/defines + other redundant code. 2012-04-08 13:11:25 +00:00
Sergey Sharybin
b37387d3b0 Port Setup Tracking scene to bmesh api 2012-03-27 09:10:05 +00:00
Sergey Sharybin
c6c8b283fa Setup tracking scene works again now 2012-03-26 07:51:47 +00:00
Campbell Barton
385c11d92c last commit broke cycles, also add BMESH_TODO's for python scripts that need upgrading. 2012-03-23 00:56:22 +00:00
Sergey Sharybin
c966601e86 Reset Use Active Clip for Follow Track constraints when linking empty to a track 2012-02-09 10:24:44 +00:00
Campbell Barton
1f74789d12 Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling 2012-02-08 04:37:37 +00:00
Campbell Barton
6927dcbf6f fix [#30068] Link Empty to Track python error
incorrect attribute used (likely code added since last release).
2012-02-04 11:12:18 +00:00
Bastien Montagne
ccd1d86638 Fixing a typo in Clip ui... 2012-01-30 20:41:36 +00:00
Sergey Sharybin
bcbe9ca5fc Color channels used for tracking is now a part of default tracking settings and also a part of presets. 2012-01-26 15:33:16 +00:00
Sergey Sharybin
6eb3d5cb50 Movie clip editor: default tracking settings can be copied from active track now 2012-01-26 15:04:25 +00:00
Campbell Barton
391a214303 pep8 edits, also remove unused vars 2012-01-17 17:57:20 +00:00
Thomas Dinges
015b64be2a * Fixing a typo in clip operators.
CLIP_spacees_walk > CLIP_spaces_walk
2012-01-05 16: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
e7fb276e29 picky edits - use "" for non enum strings. 2011-12-22 03:56:21 +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
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
Sergey Sharybin
1ec4ceac7e Added Z-Combine node to default tracking scene setup 2011-11-29 17:41:15 +00:00
Campbell Barton
f8affbb980 skip importing shutil on load. 2011-11-24 21:59:43 +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
Sergey Sharybin
697e4d2ca7 Last part of camera tracking names cleanup: bundles -> 3d markers 2011-11-21 17:05:27 +00:00
Sergey Sharybin
57e75591b6 Tweaks in convert tracking constraint to f-curves operator. 2011-11-20 11:44:32 +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