Commit Graph

66005 Commits

Author SHA1 Message Date
Sergey Sharybin
89b61e5430 Bundle updated version of carve. Should be no functional changes, small code cleanup 2012-05-10 11:00:02 +00:00
Sergey Sharybin
b73307471f Synchronize libmv with changes in git branch 2012-05-10 10:39:28 +00:00
Sergey Sharybin
7ca990f2a9 Tomato: re-integrate ceres library with updates needed for tracking improvement
Also commit missed patch.
2012-05-10 10:17:59 +00:00
Campbell Barton
4effdf4aff fix [#31382] Loop Cut and Slide numpad (-)
investigation lead to finding 3 bugs here...
- transform key input handling didnt ignore minus key on an unsigned value as it should.
- not being able to set numcuts to 0 made typing in numbers not very useful.
- backspace would set the cuts to an unsigned value.
2012-05-10 07:10:39 +00:00
Campbell Barton
caba2601ea fix for fix, own fix for [#31368] didnt work right, now move shadeless & wire paint drawing into draw_mesh_paint(). 2012-05-10 06:32:24 +00:00
Nicholas Bishop
10d1cde0ad Potential fix for bug #31111, Remesh modifier generates artifacts on simple surfaces
Changed one of the intersection tests to use < rather than <=

The sharp and smooth modes look fine now for the special case that was
reported broken; blocks mode looks correct but "jumps" slightly from
one octree resolution to another, so may need additional corrections.
2012-05-10 05:13:10 +00:00
Nicholas Bishop
3d65c502e1 More code cleanup in intern/dualcon.
Removed a lot of unused code, added comments and some clearer
naming. Minor code shuffles and style cleanup too.
2012-05-10 05:12:58 +00:00
Nathan Letwory
4071b2a8cd Apply [#30199] Fix COLLADA export of material names
Submitted by Daniel Balster
2012-05-09 22:54:18 +00:00
Gaia Clary
a986ece4b3 fix: #31374 Wrong/Missleading hint texts in material assignment. (as clarified with Daniel Salazar & Campbell Barton) 2012-05-09 19:40:54 +00:00
Campbell Barton
cd85e5b317 fix [#31383] EditBone.align_orientation() uses Vector.normalize() incorrectly 2012-05-09 19:05:29 +00:00
Gaia Clary
44ee52ab4b fix: #31374 Wrong/Missleading hint texts in material assignment. 2012-05-09 17:14:16 +00:00
Campbell Barton
1f223801d4 some speedups for face angle drawing
- avoid calculating face center when the face isnt used at all.
- avoid copying vectors when its not needed.
2012-05-09 16:43:09 +00:00
Ove Murberg Henriksen
8776458e74 gui fixed 2012-05-09 16:38:49 +00:00
Ove Murberg Henriksen
f61e50aa4e it works!
Even it compiles some code might still not be implemented. 
(I know the gui lacks).
2012-05-09 16:24:46 +00:00
Sergey Sharybin
c59f8506c0 Camera tracking: exr frames used to be displayed in linear space
It was a regression since texture buffer merge from tomato, now ensure
all display happens in sRGB space as it used to be before.
2012-05-09 16:00:39 +00:00
Brecht Van Lommel
369f5b79ea Fix #31371: copy data path should be disabled in places where it doesn't work,
like the user preferences.

Also renamed "View Docs" menu entry to "Python Documentation".
2012-05-09 15:54:25 +00:00
Brecht Van Lommel
686fe23c9d Fix crash doing alt+A playback in files saved in version <= 2.34, this code runs
before the version patch which it ideally shouldn't, but moving it to a different
location is tricky.
2012-05-09 15:54:22 +00:00
Campbell Barton
b52d55f266 fix [#31378] Face Angle Rounding To Agressive/Not done in 2.49x? 2012-05-09 15:43:02 +00:00
Sergey Sharybin
5b7cad343e Initial Ceres integration into Blender
Currently only put sources of Ceres library into extern/libmv/third_party and
setup CMake and SCons building systems.

Integration details:

- Even CMake build files are not re-used from Ceres's trunk: they're using some
  automatic stuff detection like glog, pthreads, protobuf and so and it's not
  so clear how to re-use that files without modifications.
  And IMO it's easier if build files are getting re-generated automatically to
  match Blender-specific setup rather than keeping changes made locally in
  Blender in sync when re-bundling Ceres library. Especially in case when it's
  alerady needed to support SCons build system.
- Integrated only actual sources, all tests were stripped. Probably it'll be nice
  to have them, but they'll need clear integration with current module test stuff
  in Blender.
  Hopefully integration went smooth.
- Suitesparse was disabled. It'll help a lot having it, but there are some difficulties
  making cholmod working fine on windows. Would be added in future
- collections_port.cc was also stripped. It's not used by Ceres's upstream and
  it gives compilation error (undefined uint32 -- looks like namespace issue).
- Currently all schur eliminators are included. Not sure if it makes sense,
  also not sure if it makes sense having them switchable on and off -- IMO better
  to have single configuration which works and does not require special tweaks
  after everything was set up.
- Personally i'd say if some of Ceres modules are not used better to drop it
  away -- all symbols would be stripped anyway, but it'll be waste of compilation
  time which is annoying in cases when one doing, say, binary search of revision
  at which some regression was introduced. Especially when it's easy to add modules
  which should be used by Blender.
  But as long as it stays in Tomato i'm not worrying much about this.

To bundle updated version of Ceres:

- You'll need to use GIT-SVN checkout,
  Re-bundling Ceres using SVN is still NOT supported!
- Go to extern/libmv/third_party/ceres folder
- Run ./bundle.sh

This will checkout fresh Ceres snapshot of Windows branch (which is currently
most interesting from integration into Blender POV), apply all patches listed
in patches/series and copy needed files into Blender's working copy. This will
also re-generate CMake/SCons build rules.

If you'll need extra files from Ceres repository which are not present in
Blender, you'll need to copy them manually and then run ./mkfiles.sh from
extern/libmv/third_party/ceres folder which will update list of files used
by Blender.

Thanks all Ceres developers for this library and thanks to Keir Mierle with
help integrating Ceres into Blender!
2012-05-09 15:39:54 +00:00
Sergey Sharybin
dfad263219 Merging r46456 through r46468 from trunk into soc-2011-tomato 2012-05-09 15:37:56 +00:00
Campbell Barton
379dcd8e07 style cleanup: png 2012-05-09 15:21:45 +00:00
Campbell Barton
cb78ba16bf patch [#31355] 16-bit pngs are only read with 8-bit precision
from David M (erwin94)
2012-05-09 15:20:08 +00:00
Bastien Montagne
318b44fe5d Refactor of modifiers' apply function: now use a single bit-flag parameter to pass options, instead of having one parameter per boolean flag (i.e. replaces current useRenderParams and isFinalCalc by a single ModifierApplyFlag flag. ModifierApplyFlag is an enum defined in BKE_modifier.h). This way we won't anymore have to edit all modifier files when e.g. adding a new control flag!
Should have no effect over modifier behavior.
2012-05-09 15:00:26 +00:00
Campbell Barton
895e426e26 patch [#31359] Py Console: Empty current line
from Sebastian Nell (codemanx), with some edits

- Changed key shortcut to Shift+Enter.
- made into its own operator since it works differently to delete.
2012-05-09 14:58:57 +00:00
Ove Murberg Henriksen
68179be662 svn merge ^/trunk/blender -r45927:HEAD --accept=theirs-full
This revision does not compile. code need to be merged in manualy.
2012-05-09 14:55:50 +00:00
Sergey Sharybin
e6a022816c Remove unneeded and unused patch for libmv 2012-05-09 12:30:15 +00:00
Brecht Van Lommel
e45530ef8f Fix #31366: check to enable opengl quadbuffer stereo was wrong, causing it to
not work and making other stereo modes not work when the graphics card did not
support quadbuffer stereo.
2012-05-09 11:11:35 +00:00
Campbell Barton
385e5eb92e code cleanup: color/bw conversion - use BLI color function.
change modifier to use the average of the RGB since perceptual conversion isn't really needed for modifiers.
2012-05-09 10:48:24 +00:00
Sergey Sharybin
a2ed2b36f3 Fix for recent changes in glsl
smooth seems to be a keyword in glsl and using it as a name for function property caused issues.
2012-05-09 10:14:01 +00:00
Antony Riakiotakis
ce45c004a3 classic compile error: GLEW_STATIC needs to be define when we use opengl functions 2012-05-09 09:49:24 +00:00
Sergey Sharybin
78f3d31cfd Merging r46414 through r46455 from trunk into soc-2011-tomato 2012-05-09 09:41:27 +00:00
Campbell Barton
d20c129a9c style cleanup: whitespace/operators 2012-05-09 09:24:15 +00:00
Sergey Sharybin
c2863e3f9b Fix #31349: Composite node is not found when part of a group.
Made smarter check for composite output node which now checks if there are
composite output nodes in group nodes.
2012-05-09 09:02:06 +00:00
Sergey Sharybin
f4705b38f9 Camera tracking: fixes for tracking of float images
- Fixed suddenly disappearing preview image from track widget
- Also suddenly stopping tracking should be fixed now

Both issues were caused by mixing working with floats and bytes and
in some cases it was wrong or missed checks done for this.
2012-05-09 08:33:11 +00:00
Sergey Sharybin
91227ff6d0 Update Eigen3 library, would be needed for some further integraiton. 2012-05-09 08:33:05 +00:00
Campbell Barton
e132098599 copy constraints to object/bones had same name (made operator search confusing) 2012-05-09 08:29:37 +00:00
Lukas Toenne
8d5006f9ec Fix #31369. Needed some do_versions backward compatibility code to ensure the old file path was split correctly into base path + filename. 2012-05-09 08:28:50 +00:00
Nathan Letwory
d644069860 Apply [#31335] COLLADA: fix for odd names for materials in exported dae files
Patch by Gaia Clary

This patch removes the index numbering from materials, which is not necessary.
2012-05-09 08:14:49 +00:00
Campbell Barton
94fa7060a8 fix [#31368] No masking drawn in Weightpaint-mode when displayed as wireframe 2012-05-09 06:22:29 +00:00
Dalai Felinto
b651f61278 bgl new methods (for glsl shaders - #version 120)
** I did not update rst docs. I will post on the quick-hack list. If no one volunteers to do it, I have it done before next release. **

this patch add the barebone functions to do glsl shaders in an addon.
For simplicity sakes it supports old GLSL, but not all the new modern methods (glBindFragDataLocation, ...).

It should be enough to make an addon to help with bge 2d filters.
I'm using this with a 3dview callback and it's working nicely:
self._handle = context.region.callback_add(draw_callback_px, (self, context), 'POST_VIEW')

I was considering not to commit this patch due to it not covering all OpenGL new methods.
But frankly it's not the first time bgl is expanded upon individual needs (guilty of that myself).
If a python developer knows enough to use OpenGL and need new functions, s/he should also be able to patch Blender for that,
so I see no problems here.

Another solution is to move to PyOpenGL or similar any soon. 

glShaderSource implemented differently than opengl standards. It's taking one source at a time (instead of an array of sources).
This is similar with PyOpenGL solution.

glActiveTexture
glAttachShader
glCompileShader
glCreateProgram
glCreateShader
glDeleteProgram
glDeleteShader
glDetachShader
glGetAttachedShaders
glGetProgramInfoLog
glGetProgramiv
glGetShaderInfoLog
glGetShaderiv
glGetShaderSource
glGetUniformLocation
glIsProgram
glIsShader
glLinkProgram
glShaderSource
glUniform1f
glUniform2f
glUniform3f
glUniform4f
glUniform1fv
glUniform2fv
glUniform3fv
glUniform4fv
glUniform1i
glUniform2i
glUniform3i
glUniform4i
glUniform1iv
glUniform2iv
glUniform3iv
glUniform4iv
glUniformMatrix2fv
glUniformMatrix3fv
glUniformMatrix4fv
glUniformMatrix2x3fv
glUniformMatrix3x2fv
glUniformMatrix2x4fv
glUniformMatrix4x2fv
glUniformMatrix3x4fv
glUniformMatrix4x3fv
glUseProgram
glValidateProgram
2012-05-09 02:42:30 +00:00
Antony Riakiotakis
de067b2e0d update stubs for blenderplayer 2012-05-08 23:48:04 +00:00
Brecht Van Lommel
c8cbe63947 Cycles: fix issues with texture coordinates and object scale. Auto texture
space size and location were outdated often, and already computed on demand
by blender internal, now do that through RNA as well.
2012-05-08 23:39:31 +00:00
Keir Mierle
f33080532c Enhance logging in libmv's trackers.
Cleanups in brute_region_tracker.cc.
2012-05-08 23:13:53 +00:00
Nicholas Bishop
d93a935965 Fix division by zero case in dualcon. 2012-05-08 22:11:16 +00:00
Nicholas Bishop
56342f222f Code style cleanup in intern/dualcon. 2012-05-08 22:11:05 +00:00
Brecht Van Lommel
d9ce1cda94 Python/context: python could get invalid bpy.data in scene update handler after
undo.

The way this got updated from the context is a bit unreliable, and for handlers
the update couldn't happen because there is no context passed in. Now it's
updated from setup_app_data, which is where the change actually happens. I left
in the other updates to be sure but they should not be needed anymore.
2012-05-08 22:07:06 +00:00
Campbell Barton
f6abd6ee40 style cleanup: graph & armature 2012-05-08 20:18:33 +00:00
Brecht Van Lommel
d9a70ceeb1 Fix 31370: light falloff node linear output not working code.
Fix part of thread safety issue, there's still something else wrong.
2012-05-08 19:57:56 +00:00
Ove Murberg Henriksen
7b3beec987 merging back to a version that works...
svn merge -r46433:46359 .
2012-05-08 19:49:39 +00:00
Campbell Barton
81255ca8ce style cleanup: gpencil & metaball 2012-05-08 18:29:02 +00:00