archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
52,900 Commits 660 Branches 0 Tags
57dba739176153e052d77611ff0e554f05984686
Commit Graph

15 Commits

Author SHA1 Message Date
Tamito Kajiyama c1ceab1281 Merged changes in the trunk up to revision 55357. 
Resolved conflicts:
release/datafiles/startup.blend
source/blender/editors/space_nla/nla_buttons.c

Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of
recent changes for the use of bool.
 2013-03-18 00:48:59 +00:00
Campbell Barton 40bfce6616 use bool for knife, also scons tab/space mix. 2013-03-15 19:00:21 +00:00
Tamito Kajiyama feccbaabbd Merged changes in the trunk up to revision 53584. 
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h

Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
 2013-01-05 22:24:05 +00:00
Nicholas Bishop 2e9cb31c02 Add BMLog for efficiently storing changes to vertices and faces 
The BMLog is an interface for storing undo/redo steps as a BMesh is
modified. It only stores changes to the BMesh, not full copies.

Currently it supports the following types of changes:
- Adding and removing vertices
- Adding and removing faces
- Moving vertices
- Setting vertex paint-mask values
- Setting vertex hflags
 2012-12-30 18:24:08 +00:00
Tamito Kajiyama a462d69bbf Another big patch set by Bastien Montagne, thanks a lot! 
* Made Freestyle optional (turned on by default).

* Fix for missing bpath.c updates in the previous merge of trunk changes.
 2012-12-20 07:57:26 +00:00
Bastien Montagne ab2c273b12 Added GPL header to sconscripts! 
Also changed shebang to '#!/usr/bin/env python', this is more portable across unixes...
 2012-12-17 08:01:43 +00:00
Bastien Montagne c9dade4fe0 Big i18n commit: add "reports" from bmesh/readfile/tracking/dynapaint (and a few others), and another bunch of UI messages tweaks/fixes, as well as some BKE_report()<->BKE_reportf()... 2012-10-26 17:32:50 +00:00
Thomas Dinges ba48c94a8b Compile fix for r51578: 
* Scons include missed the comma, caused Bullet Include to fail.
 2012-10-24 10:54:50 +00:00
Daniel Genrich 3ce334e188 Merge GSoC project from branch: Laplacian Smooth (Operator & Modifier) 
by Alexander Pinzon Fernandez (apinzonf)

Supported by Google Summer of Code 2012

Project Documentation:
http://wiki.blender.org/index.php/User:Apinzonf

Manual Page:
http://wiki.blender.org/index.php/User:Apinzonf/Doc:2.6/Manual/Modifiers/Deform/Laplacian_Smooth
 2012-10-24 10:39:11 +00:00
Nicholas Bishop 1dadd3b7c6 Partially replace convex hull implementation with Bullet implementation 
* Bullet's convex hull implementation is significantly more robust
  than the one I implemented, as well as being faster.

* This fixes bug [#32864] "Convex Hull fails in some cases."
  projects.blender.org/tracker/?func=detail&aid=32864&group_id=9&atid=498

  That bug, and others like it, relate to the poor handling of
  co-planar surfaces in the input. Pretty much any model that is
  simple-subdivided a few times gave very bad results before, Bullet's
  implementation handles this much better.

* In order to ensure a smooth transition, the Bullet output is
  translated into the existing HullTriangle hash structure. This makes
  it easy to ensure that the existing slot output stays the same; the
  interactions between the slots are somewhat complicated, detangling
  is a TODO.

* Reviewed by Brecht:
  https://codereview.appspot.com/6741063
 2012-10-23 23:54:15 +00:00
Campbell Barton 8baa5fbde2 - fix for python freeing its own bmesh clearing the global mirror cache. 
- fix for own mistake (Ctrl+T didnt set beauty peroperty).
- remove bad level includes in bmesh.
 2012-04-23 04:24:11 +00:00
Campbell Barton 1823bb4abb fix for building bmesh bevel with scons (source file was left out) 2012-03-16 05:25:02 +00:00
Campbell Barton 17786b3b3e building without python works again, cleanup bmesh include paths (cmake and scons). 2012-03-08 03:25:53 +00:00
Antonis Ryakiotakis 9ca3084d4d Attempt to fix scons compilation of blenderplayer. 
Added bmesh to player libraries and changed the priority of blenlib so as to avoid duplicate definitions (looks like there are actually functions defined twice that cause conflicts if one changes the order of linking...figures).

Only tested this on mingw-windows, I hope it works elsewhere too.
 2012-02-22 03:16:34 +00:00
Campbell Barton afc56a0b10 copying bmesh dir on its own from bmesh branch 2012-02-19 18:31:04 +00:00