griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,616 Commits 1 Branch 0 Tags
da170d9dc3dd84f1b77f737a94d5863b0d67dd21
Commit Graph

647 Commits

Author SHA1 Message Date
Tamito Kajiyama
dd8e836067 Merged changes in the trunk up to revision 51853. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c

This commit also includes a fix of a bug identified during the merge and committed in revision 51853.
Thanks Thomas (dingto) for the timely fix!
 2012-11-04 02:22:56 +00:00
Campbell Barton
f8112b40a6 correct operator preset tooltip and dont save their settings for re-use 2012-11-02 12:09:59 +00:00
Campbell Barton
d705c52e65 no longer use 'check_existing' to see if we need to have a save popup, instead use 'exec' operator on a saved file and 
invoke on unsaved files.

correct missing memset --> CustomData_reset switch too.
 2012-10-31 17:03:31 +00:00
Tamito Kajiyama
15ed834343 Merged changes in the trunk up to revision 51718. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend
 2012-10-29 01:09:12 +00:00
Campbell Barton
0e3de1df4b fix [#31661] Custom properties do no respect min/max values 
also renamed function added prev commit
 2012-10-26 10:54:02 +00:00
Tamito Kajiyama
55015daa43 Merged changes in the trunk up to revision 51448. 
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c
 2012-10-20 16:48:48 +00:00
Sergey Sharybin
a75f11d036 Fix #32219: Inconsistent influence of Units Scale on new objects 
Made it so meshes, curves, surfaces and metaballs are scaling to a grid cell size,
which makes them behave consistently now.

There're still issues to be resolved still:

- Lattice is not scaled to grid cell size yet, it uses slightly different add
  function which makes scaling a bit tricky and hacky. Would prefer to do a
  bit bigger refactor here, so it's a TODO for now.

- Cameras, speakers and other helpers are not scaling. They don't have data
  on which scale could be applied and perhaps it should be some kind of draw
  scale. Also would consider it's a TODO for now.
 2012-10-19 12:53:03 +00:00
Campbell Barton
b7642348e4 simplify addon install print, Now it only prints the source and destination dirs, with a list of addons added. 
don't think its needed to print the full path of each addon.

also remove the __MACOX check, its harmless and people can make sure there zips dont have cruft in them before distributing them.
 2012-10-19 10:37:24 +00:00
Gaia Clary
9d1873154f [#32921] Fix: Python error triggered when installing an addon via 'install addon' button 2012-10-19 08:51:31 +00:00
Campbell Barton
f97dfdf227 quiet clang static checker warning by returning an error for invalid situation getting an IDProp mapping from a PyObject. 
also print the path installed to when installing an addon.
 2012-10-12 03:24:47 +00:00
Daniel Genrich
cb634b9100 Google Summer of Code project: "Smoke Simulator Improvements & Fire". 
Documentation & Test blend files:
------------------
http://wiki.blender.org/index.php/User:MiikaH/GSoC-2012-Smoke-Simulator-Improvements

Credits:
------------------
Miika Hamalainen (MiikaH): Student / Main programmer

Daniel Genrich (Genscher): Mentor / Programmer of merged patches from Smoke2 branch
Google: For Google Summer of Code 2012
 2012-10-10 13:18:07 +00:00
Gaia Clary
3606cd5216 Cosmetic: Changed label of the 'Install Addon...' Button to 'Install from File...' 2012-10-10 08:04:04 +00:00
Sergey Sharybin
08fc8c3561 Fixed wrong preset settings for motion tracking 2012-10-09 16:29:27 +00:00
Campbell Barton
9fa36b12cc style cleanup: pep8 2012-10-08 08:28:05 +00:00
Tamito Kajiyama
1fe70c07a0 Merged changes in the trunk up to revision 51126. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/WM_types.h
 2012-10-06 23:32:21 +00:00
Sv. Lockal
ab2a9de4b4 Add translation context for volume (Audio), pitch (Rotation) and rename tip->tooltip for custom properties 
Tracked in [#31062] [2.6x] Context Ambiguity List & Discussion (keep updating)
 2012-10-04 18:21:34 +00:00
Campbell Barton
78d6288be3 correct spelling error in operator property 2012-10-02 13:13:26 +00:00
Tamito Kajiyama
e91f33101f Merged changes in the trunk up to revision 50956. 
Conflicts resolved:
source/blender/editors/interface/resources.c
 2012-09-30 13:16:55 +00:00
Campbell Barton
8a51d235e6 pep8 cleanup 2012-09-26 21:19:51 +00:00
Tamito Kajiyama
4172997675 Merged changes in the trunk up to revision 50607. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
 2012-09-15 00:15:24 +00:00
Campbell Barton
12da3d999b modifications needed to get a URL from an RNA id from the testing script 2012-09-13 00:26:01 +00:00
Campbell Barton
7b15620da0 fix [#32350] F11 play animation crash when UI language is not "Default" 
this is a bug in boost 1.46, can remove this env var override when this version of boost is no longer supported.
 2012-09-12 08:06:06 +00:00
Campbell Barton
6b1895d64c when pressing play report when the first frame can't be found. 2012-09-10 02:04:02 +00:00
Campbell Barton
8cf9e5f8c3 change templates to call modal_handler_add() is called last since any errors between calling this function and returning will crash blender. see [#30687] 2012-09-05 00:11:39 +00:00
Sergey Sharybin
3e540d4d4c Fix #32372: Blender Locks up when using Quick Fluid feature 2012-09-03 16:08:28 +00:00
Tamito Kajiyama
141dd5233e Merged changes in the trunk up to revision 50257. 
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
 2012-08-29 00:53:29 +00:00
Campbell Barton
a7ec09aef9 ability to register your own online manual callbacks - useful for 3rd party addon developers, who may want to link to their own URL's. 2012-08-25 14:07:51 +00:00
Brecht Van Lommel
32a05baad9 Fix #32388: bpy.ops.wm.path_open() not working with path with spaces on Windows. 2012-08-23 11:18:31 +00:00
Campbell Barton
257c6de9ac copy as script operator for the console, so you can copy input from a console for use in a textblock. 2012-08-19 21:32:18 +00:00
Tamito Kajiyama
22b30da565 Merged changes in the trunk up to revision 49986. 2012-08-18 15:20:35 +00:00
Campbell Barton
b0371f053c style cleanup 2012-08-17 18:36:20 +00:00
Campbell Barton
dac761057d fix for crash showing tooltip for NODE_OT_add_search() 2012-08-17 11:31:54 +00:00
Campbell Barton
27a8487070 style cleanup: pep8 & unfinished comment from own commit. 2012-08-14 18:43:15 +00:00
Lukas Toenne
e83ef85576 Python node operator for combined node collapsing and hiding unused sockets. Socket hide flag is added to RNA as well, but can only be set when the socket is not connected, to avoid dangling links in editor drawing. Currently this operator has no default hotkey, but can be called from the Node menu. 2012-08-14 17:56:33 +00:00
Tamito Kajiyama
44e4c5f831 Merged changes in the trunk up to revision 49797. 2012-08-12 00:09:57 +00:00
Lukas Toenne
b465039ee7 Extended the search operator for nodes to also support node groups. The basic node group type is not included in the node items list, instead all existing node groups are added to the items list in the callback. A prefix is used to distinguish base node types from node groups. 2012-08-10 07:22:36 +00:00
Campbell Barton
de131177b0 code cleanup: lazy init enum for node search 2012-08-08 17:02:14 +00:00
Lukas Toenne
bd3ec60651 Search option for adding nodes. 
The 'Add' menu in the node editor now has an option 'Search' at the top, which opens a separate popup for searching node types by name.

The operator for this is implemented completely in Python (this could also be done for the regular menu-based Add options in the future). There are a few necessary extensions to the RNA as well:

* The View2D struct in regions is now exposed. Currently only contains converter functions for coordinates from the region to the view (i.e. scrolled and zoomed view space). Used for converting mouse location to node space.

* The SpaceNode exposes the existing 'cursor_location' for operators to store mouse position beyond invoke calls. Not used for anything else (transforms) so far.

* The edit_tree in SpaceNode is also exposed, this is needed for operators to work correctly inside node groups.
 2012-08-08 16:44:16 +00:00
Campbell Barton
db6c4ba11e bring back the play option from 2.4x 2012-08-06 16:07:11 +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
Tamito Kajiyama
4ea2fb8b0a Merged changes in the trunk up to revision 49478. 
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
 2012-08-02 00:10:05 +00:00
Sergey Sharybin
72a106d56f Fix #32165: context_set_value didn't make an undo push when changing scene settings 
This lead to such issues as changing mesh selection mode wasn't doing undo push
when it need to.
 2012-07-24 15:51:26 +00:00
Tamito Kajiyama
3b012c041f Merged changes in the trunk up to revision 49090. 2012-07-20 23:12:05 +00:00
Campbell Barton
21c0895466 poll function for edge loop delete. 2012-07-19 08:04:12 +00:00
Tamito Kajiyama
065605e0da Merged changes in the trunk up to revision 48893. 
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h
 2012-07-13 23:23:06 +00:00
Bastien Montagne
30037194cd Minor UI message update. 2012-07-07 13:51:07 +00:00
Tamito Kajiyama
b7b5029814 Merged changes in the trunk up to revision 48695. 2012-07-06 23:46:48 +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
Bastien Montagne
4149ea5f50 Last spell checking (for now). 
Only mysterious courant from bpy.types.ParticleSettings.courant_target reamins...
 2012-07-04 15:52:07 +00:00