griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
35,188 Commits 1 Branch 0 Tags
444833a8fbecde23ccc6a1a78be7a97f052d2cfd
Commit Graph

1279 Commits

Author SHA1 Message Date
Campbell Barton
deb3b7e282 replace editmode topo mirror function from the one in trunk (ED_mesh_mirrtopo_init) 2011-12-20 22:01:11 +00:00
Campbell Barton
cceef0d44f svn merge ^/trunk/blender -r42759:42761 2011-12-20 21:28:57 +00:00
Campbell Barton
b70174cb93 move topology mirror out into its own functions - needed for bmesh branch so we can use then for bmeshes own internal mirror calculations. 2011-12-20 10:05:58 +00:00
Campbell Barton
e5b1f9c28d svn merge ^/trunk/blender -r42660:42669 2011-12-16 23:26:29 +00:00
Campbell Barton
d39adcb478 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.
 2011-12-16 07:27:56 +00:00
Campbell Barton
862dc635ed svn merge ^/trunk/blender -r42617:42655 2011-12-15 23:59:02 +00:00
Sergey Sharybin
9e4d9e066a Fix #29577: repeat curve duplication not working in 2.60(as well as 2.61rc1) 
Issue was caused by direct call of transforn operator from extrude and duplicate,
made them macro of duplicate/exturde and transform, so now repeating works nicely.
 2011-12-15 07:54:13 +00:00
Campbell Barton
eb233d9332 syncing some minor formatting edits from bmesh branch. 2011-12-04 23:04:43 +00:00
Campbell Barton
9e5b28cd42 svn merge ^/trunk/blender -r42261:42290 2011-11-30 09:31:11 +00:00
Sergey Sharybin
3612a8d3d4 Deduplicate code used for drawing text information at the top of space region. 2011-11-30 06:03:10 +00:00
Campbell Barton
faa022563d svn merge ^/trunk/blender -r42245:42261 2011-11-29 18:18:56 +00:00
Campbell Barton
f62ad8f69b remove header text: 
"The Blender Foundation also sells licenses for use in proprietary software under the Blender Licens"

also remove NaN references from files that have been added since blender went opensource.
 2011-11-29 10:54:47 +00:00
Campbell Barton
063dd4f60a svn merge ^/trunk/blender -r42197:42221 2011-11-28 17:09:13 +00:00
Campbell Barton
c126bfba82 view3d - replace magic numbers with an enum to be used with mesh_foreachScreenVert, mesh_foreachScreenEdge since it wasnt clear how the values are used. 
also resolved use of un-initialized variable.
 2011-11-28 16:44:17 +00:00
Brecht Van Lommel
7baaa08211 Fix #29389: cycles viewport render not updating on frame changes. This sort of 
worked by accident before, because of flags that weren't cleared properly. Now
moved the call to update render engines into scene_update_* itself.
 2011-11-28 14:55:35 +00:00
Campbell Barton
4b3976cc5a svn merge ^/trunk/blender -r42116:42139 2011-11-24 20:01:45 +00:00
Sergey Sharybin
c1c3d66079 Fix #29306: Alt+N, Enter In Image View Does closes the dialog without executing. 
If enter is pressed outside of any button in menu, generate two menu return values:
- UI_RETURN_CANCEL so button wouldn't be executed
- UI_RETURN_POPUP_OK so callback associated with popup block would be executed
 2011-11-24 13:51:31 +00:00
Campbell Barton
74c6c91ba6 svn merge ^/trunk/blender -r42080:42095 2011-11-23 17:14:27 +00:00
Sergey Sharybin
a91bd43d38 Fix compilation error of blenderplayer caused by recent commit. 2011-11-23 16:44:33 +00:00
Sergey Sharybin
85497e35d0 Added method clear to most of collections which supports new/remove. 
This method not added to animation-specific structures yet/
 2011-11-23 16:12:11 +00:00
Campbell Barton
ac814498a2 svn merge ^/trunk/blender -r42069:42076 2011-11-22 18:15:08 +00:00
Lukas Toenne
b450d3c3b6 Fix for long-standing TODO item: Clicking on overlapping nodes would activate buttons below. 
This patch adds a new CLIP_EVENTS flag for uiBlock, which will prevent the ui_but_find_mouse_over search function from looking into "lower" uiBlocks (i.e. those further back in the list). The order of block creation for nodes has also been updated to use the z-ordering (just the nodetree->nodes list).

In order for this to work, the bounding box values of the uiBlocks have to be set explicitely to fit the node size, those are usually either zero or calculated from the internal buttons.
 2011-11-22 17:49:06 +00:00
Campbell Barton
f9e00b5c99 svn merge ^/trunk/blender -r42009:42053 2011-11-22 11:51:42 +00:00
Campbell Barton
da25b50ccb image save operator now shares settings and UI with render & image out node. 
details:
- setting format options from python isnt possible anymore since this isnt exposed via op->properties, python should use image.save() function instead.
- image save UI now hides 'Relative' option when copy is selected since it has no effect.
- default image depth is set to 8 or more if the image has no float buffer, otherwise its set to 32 or less.

other fixes:
- image new was adding an image with a filepath set to "untitled", if this file happened to exist in the current directory a save on the generated image would overwrite it, now initialize to empty path.
- BKE_ftype_to_imtype was returning an invalid value if ftype==0.
 2011-11-21 23:56:32 +00:00
Campbell Barton
0e2c8cdcdd move image settings into their own structure so the interface can be shared where image saving settings are needed. 
currently file out node and render output share this struct & UI.
 2011-11-21 20:19:58 +00:00
Campbell Barton
8eb41f0fdb svn merge ^/trunk/blender -r41998:42009 2011-11-20 16:05:51 +00:00
Brecht Van Lommel
d4c400b940 UI: fix issue with part of panels going offscreen after recent commit. 
The code here was tricky, with ED_region_panels trying to match the complex
logic in uiAlignPanelStep, now refactored the code so it's avoided.
 2011-11-20 14:31:01 +00:00
Campbell Barton
3c8d86e117 svn merge ^/trunk/blender -r41961:41998 2011-11-20 01:14:33 +00:00
Brecht Van Lommel
7217518179 UI: 
* Add theme option to show panel header background.
* Draw panel collapse widget a bit smaller.
* Add theme option to draw icons muted.
* Code tweak: replace U.themes.first by UI_GetTheme() calls.
 2011-11-19 20:57:53 +00:00
Brecht Van Lommel
5d2a155f2b Camera: some more refactoring, mostly in the function that computes the camera 
border, now we just get the border coordinates from comparing the viewport and
camera viewplanes.
 2011-11-19 18:35:42 +00:00
Campbell Barton
14ddf19ad2 make it clearer which arguments in transform snap are return values (no functional change) 2011-11-19 00:52:54 +00:00
Brecht Van Lommel
d88262a1bf Camera: some more code deduplication. 2011-11-18 23:32:17 +00:00
Brecht Van Lommel
5429a701c4 Camera: more code refactoring, adding a function to create CameraParams from 
3d view, deduplicating the complex code for setting up the viewplane.
 2011-11-18 21:19:03 +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
c00c0134e0 svn merge -r41847:41899 ^/trunk/blender 2011-11-16 03:10:15 +00:00
Sergey Sharybin
e8906f5254 Fix #29253: 3D Manipulator: "Active Element" not supported for curves 
This funcitonality simply wasn't implemented for curves yet, implemented it now.
 2011-11-15 06:37:47 +00:00
Campbell Barton
e6e265b2b5 svn merge -r41779:41847 ^/trunk/blender 2011-11-15 02:58:06 +00:00
Campbell Barton
e59ab6486f svn merge -r41751:41779 ^/trunk/blender 2011-11-15 02:05:32 +00:00
Campbell Barton
9e6860d864 fix [#29242] menus have no keyboard shortcuts 2011-11-14 14:42:47 +00:00
Campbell Barton
e84c0980a3 correct indentation and some whitespace edits (no functional changes) 2011-11-11 13:09:14 +00:00
Campbell Barton
eadb192986 svn merge -r41723:41751 ^/trunk/blender 2011-11-11 06:37:29 +00:00
Campbell Barton
92d35b74e7 svn merge -r41722:41723 ^/trunk/blender 2011-11-11 06:25:45 +00:00
Brecht Van Lommel
3863aa9114 Cycles: fix crash in image assign/remove in image editor. 2011-11-10 13:39:25 +00:00
Miika Hamalainen
afeb0eeaf0 Dynamic Paint merge: 
Commit Dynamic Paint from "soc-2011-carrot" branch into trunk.

End-user documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Dynamic_Paint

GSoC wiki page:
http://wiki.blender.org/index.php/User:MiikaH/GSoC-2011-DynamicPaint
 2011-11-10 10:24:34 +00:00
Campbell Barton
121ff4223d svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build 2011-11-10 04:17:43 +00:00
Campbell Barton
5caf6e9070 presets now work from non-redo popups, 
ended up having to add a new pointer into the uiBlock (which I'd rather have avoided), but setting the uiLayoutSetContextPointer(..) was complicated to properly use for submenus and popus.
 2011-11-10 03:44:50 +00:00
Campbell Barton
685041d53a svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs 2011-11-10 03:05:11 +00:00
Miika Hamalainen
1b4a54ad73 Merge with trunk r41701 2011-11-09 15:46:53 +00:00
Bastien Montagne
e4269043b4 Moving i18n code to BLF_translation.h 
This way, we will be able to use it in non-UI parts of the code too.
 2011-11-09 14:13:17 +00:00