Commit Graph

66005 Commits

Author SHA1 Message Date
Campbell Barton
c2bd746fac own error in recent cmake edits 2011-06-28 16:57:25 +00:00
Sergey Sharybin
425a5886ae Camera tracking integration
===========================

Request from Sebastian König:

Change behaviour of "Clear Track Path" operator to clear
data for frames after current rather than clearing the whole track data.
2011-06-28 16:44:10 +00:00
Brecht Van Lommel
8ddd2db648 RenderEngine API: add self.report() error reporting function for render engines,
works the same as for operators. Also includes some refactoring of render error
reporting code to use ReportList.
2011-06-28 16:25:07 +00:00
Sergey Sharybin
a53035161b Camera tracking integration
===========================

- Fixed typo in marker state cache line offset.
- Do not try to track disabled markers.
2011-06-28 16:24:18 +00:00
Mike Erwin
4178b662cc enabled pan/zoom in rotation-locked 3D views + small cleanup 2011-06-28 15:59:46 +00:00
Mike Erwin
446be52164 made Pascal string less intrusive to build systems 2011-06-28 15:57:39 +00:00
Sergey Sharybin
bcf23357bc Camera tracking integration
===========================

- Fixed bug with drawing cache line for marker states.
  It worked correct for cases, when start frame was 1.
- Added color codes for path parts before current frame and
  after current frame.
- Added color code for disabled marker. Color is specifying for
  unselected disabled marker. Color for selected marker is
  calculating automatically. Color for active disabled marker
  is equal to the enabled active marker.
2011-06-28 15:46:38 +00:00
Brecht Van Lommel
3211bea679 CMake: campbell already added default build type as release a few hours
earlier in a different way, missed that, so reverting my change.
2011-06-28 15:43:03 +00:00
Sergey Sharybin
aafa30c117 Merging r37892 through r37907 from trunk into soc-2011-tomato 2011-06-28 15:43:03 +00:00
Brecht Van Lommel
ba36215669 Cycles: attempt to fix OIIO include path on windows. 2011-06-28 15:23:30 +00:00
Brecht Van Lommel
5e2c5eaa5d Cycles: fix startup.blend not merge problem. 2011-06-28 15:09:09 +00:00
Brecht Van Lommel
d18d37d25f Cycles: svn merge -r37694:37904 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-06-28 15:00:42 +00:00
Brecht Van Lommel
a05b66defb CMake: set default cmake build type to Release. Without that you would
get a build that has neither debug symbols nor optimization, now it
will build an optimized blender by default.
2011-06-28 14:42:11 +00:00
Brecht Van Lommel
6b2e35c8b7 Cycles: cmake tweak to make specifying OSL/OIIO path simpler. 2011-06-28 14:37:08 +00:00
Brecht Van Lommel
f351e3572d Cycles: fix for dynamic library copying on linux. 2011-06-28 14:25:52 +00:00
Brecht Van Lommel
bdb92dab74 Cycles: for mac and unix, copy oiio/boost dynamic libraries into cycles lib
directory to avoid library path issues.
2011-06-28 13:44:47 +00:00
Brecht Van Lommel
27a99869aa Cycles: fix alt+Z shortcut not working in 3d view. 2011-06-28 13:43:18 +00:00
Campbell Barton
3c43e8e50a fix [#27782] Tileable displacement map issue in Blender 2.58
this bug was introduced in 2.58 (r37342), when adding filtering support to imagewrap(), the problem is boxsample was getting float values which were not wrapped as int values are.
2011-06-28 12:48:39 +00:00
Brecht Van Lommel
f79dcb2af7 Cycles: fix build with game engine enabled. 2011-06-28 12:21:58 +00:00
Brecht Van Lommel
919ea1c43c Cycles: uv editor and texture paint now also use active texture node. 2011-06-28 12:18:17 +00:00
Joshua Leung
0b41c479e4 Action-Management from Outliner - Unlinking Actions
It is now possible to use the Outliner for managing the active action
of an ID-block (provided that it appears in the Outliner), which
should be a bit better than having to go through the NLA Editor.

So far, this only allowing unlinking actions, using some existing
operators. To use:
1) Navigate through the Outliner tree to find the
Object/Material/Lamp/etc. that the animation belongs to. (NOTE: this
doesn't work in Datablocks mode, but should in the normal "All Scenes"
and related modes)
2) Expand the "Animation" entry below this
3) Right-click on the Action entry below this, and select "Unlink"
from the RMB menu

In the process, I've fixed problems with some data-blocks not showing
their animation data in Outliner.
2011-06-28 11:21:12 +00:00
Sergey Sharybin
75889661de Camera tracking integration
===========================

- Internal changes:
  * Rename uiTemplateMarker to uiTemplateTrack.
  * Fixed some comments in movieclip.c.
- Control channels which are affect on track.
- Fixed track deletion when it's point isn't selected.
2011-06-28 10:09:57 +00:00
Sergey Sharybin
def04fa523 Merging r37863 through r3789 form trunk1 into soc-2011-tomato 2011-06-28 10:06:06 +00:00
Campbell Barton
57f4844c43 make drawing faces in the UV editor an image space option, re-using the mesh option was lazy and doesn't make much sense. 2011-06-28 09:42:17 +00:00
Nathan Letwory
fdbae99668 Explicitly turn off JACK so it's clear it's not supported. 2011-06-28 06:56:39 +00:00
Campbell Barton
b4682414c2 fix [#27787] Smart UV Unwrap Results in Overlaps
added optional face area weighting (from 2.4x) since this can result in overlapping faces.
2011-06-28 06:51:55 +00:00
Joshua Leung
c4e28f999b Outliner Bugfixes:
* Mesh Animation-Data was not shown. Other data types would get this
shown.

* Added attempted fix for the problem where when you try to expand the
last item in a RNA list or so, you often end up expanding the first
item (and then have to close and try again, at which point the expand
works as you expected the first time round). More testing needed, but
seems to work better already
2011-06-28 05:17:17 +00:00
Joshua Leung
661c55b78a Refactoring code for filtering actions
- This is still quite convoluted unfortunately...
- I can't quite figure out what a bug note I left in the code was
about anymore. Removed.
2011-06-28 05:02:00 +00:00
Campbell Barton
c0a83d24e9 cleanup for cmake msvc build options, reference some libs directly, fix conflicting flags /Ob1 and /Zi for debug 2011-06-28 02:49:49 +00:00
Nicholas Bishop
cf90b9497f VBO:
Fix for bug found by psy-fi.

* gpu_buffers.c was using GL_ARB_vertex_buffer_object to check for VBO
  support, should be using GLEW_ARB_vertex_buffer_object.
2011-06-28 00:40:39 +00:00
Mike Erwin
30b4ff8949 first attempt at CMake fix (untested) 2011-06-27 23:24:24 +00:00
Mike Erwin
5c2e4318b5 Windows ndof now uses blender view coordinates 2011-06-27 21:52:33 +00:00
Mike Erwin
798f59fe68 Mac ndof using blender view coordinates + small but important typo fixed 2011-06-27 20:44:23 +00:00
Mike Erwin
0f8a1ed8af removed unneeded cleanup code on Linux 2011-06-27 20:18:04 +00:00
Mike Erwin
edd5980436 now using blender view coordinates for ndof input -- core and Linux in place 2011-06-27 20:12:10 +00:00
Jason Hays
84ea89e25f Merged from trunk with revision range 36835-37865,
(No conflicts had to be manually resolved)
Gave weight paint a basic ability to draw edges and vertices with an option
 (with colors for selected/unselected),
but I didn't make any vertex selection functions available in weight paint mode yet
(tested with edit mode for now).
2011-06-27 17:21:08 +00:00
Brecht Van Lommel
1cf0af703d Cycles: working towards texture workflow design
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/TextureWorkflow

* Added "active texture node" in shading node trees.
* Texture draw mode draw active texture node now, and new Material draw
  mode shows GLSL material.
* GLSL materials now match solid draw mode lighting better.
* Texture properties can now texture nodes from material/world/lamp.
2011-06-27 17:10:50 +00:00
Campbell Barton
e4f7b24e20 disable opencollada and openexr for msvc2010, gives linking errors 2011-06-27 16:33:59 +00:00
Sergey Sharybin
83d59a0680 Camera tracking integration
===========================

Fixed stypid typo which was lead to crash when switching to clip editor.
2011-06-27 14:45:50 +00:00
Brecht Van Lommel
8e90ba3b20 Fix last part of #26850: OS X game player did not react to quit event. 2011-06-27 14:34:58 +00:00
Sergey Sharybin
08407e79ea Camera tracking integration
===========================

- Fixed "sliding" when panning footage in high zoom.
  This was most noticeable near right top corner of footage.
- Fixed 1px flickering of marker during playback with
  "Lock to Selection" toggled on. This was caused by
  precision errors. Used UI_view2d_to_region_no_clip-like
  offsets calculations, but in float values. Maybe there
  could be something smarter..
- Implemented tarcking along single frame.
  Hotkey is ALT+left/right array. Also changed a bit
  tracking tools buttons in Tools panel.
- Fixed "Lock to Selection" during tracking -- tracks
  synchronization should happen before centering view.
- Approximate marker's position for frames, which haven't
  got marker for them.
  Use the nearest marker from left side for approximation.
  For frames above  first marker's framenr sue first marker
  position.
- Markers now could be disabled. Added checkbox to
  "Active Marker" panel.
- Changes in cache line:
  * Bright line means active track has marker for frame.
  * Dark line means marker's position is approximated.
  * Yellow-less line means marker is disabled for that frames.

NOTE: .blend files which are saved with previous tomato version
      would fail to work properly. I don't want to spend time
      on making that files work properly atm, so don't blame on this.
2011-06-27 14:24:23 +00:00
Sergey Sharybin
70eb9e85c5 Merging r37732 through r37862 from trunk into soc-2011-tomato 2011-06-27 14:20:48 +00:00
Brecht Van Lommel
49f84ef9ed Fix part of #26850: OS X game player was showing _NSAutoreleaseNoPool()
error messages on start. These were coming from initializing the SDL video
subsystem as part of Joystick init. We do not need this, as video stuff is
covered by GHOST, most likely this was conflicting.
2011-06-27 14:06:11 +00:00
Brecht Van Lommel
24c0f1873e Fix part of #26850: Cocoa OS X game player was not working, two issues:
* Unlike blender, the game player draws only on windows update callbacks,
  and those wer not implemented.
* Going fullscreen for player was not implemented correct, it expected an
  existing window but actually it should create one.
2011-06-27 13:57:27 +00:00
Campbell Barton
a961d62653 initialize cmake's CMAKE_BUILD_TYPE to 'Release'
add reference to cmake cache for convenience GNUMakefile
2011-06-27 13:18:08 +00:00
Joshua Leung
26b7d513f1 Small bug fixes:
* Removing the last of the owner/ownertype stuff. The bulk of this
stuff was removed in Part3 of the refactor, but it seems I forgot to
actually remove these struct members at the end of that.
* Texture datablocks without animdata aren't skipped immediately
anymore. This could lead to texture nodetrees on animdata-less
textures getting skipped.
2011-06-27 13:04:21 +00:00
Benjy Cook
ff5dbbe1b8 Some bugfixing and tweaking for retargeting. Script works now regardless of world transform on performer and end user rigs. This breaks stride bone functionality, will be addressed in next commit 2011-06-27 12:48:30 +00:00
Benjy Cook
46a4f47a5d Added more IK functionality to UI. You can now toggle IK for selected bones. 2011-06-27 12:46:53 +00:00
Campbell Barton
4dd18f7e6f fix for editmode option toggle 2011-06-27 11:40:15 +00:00
Ton Roosendaal
f10f3d3651 Bugfix #27768
On clicking in a non-active Blender window (when you activated others),
the mouse position of the first click was still the old position.

Problem is in GHOST; it sends out the 'activate window' event after the
mouseclick event itself. Code now checks for this case and reads the
correct mouse position.
2011-06-27 11:21:25 +00:00