griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
66,005 Commits 1 Branch 0 Tags
c50ccc847613bbe02bea64cee3f744b449da170c
Commit Graph

66005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Campbell Barton
5f40c0e9a5 - operator presets now work in the 3D view as well as the file selector. 
to enable from python:
  bl_options = {'REGISTER', 'UNDO', 'PRESET'}

from C:
  ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_PRESET;

- added context member 'active_operator'
- enable this for 'Add Torus' for testing.
 2011-11-08 16:59:06 +00:00
Jens Verwiebe
51ead63ae6 Fix compile after audaspace file source.remove.. 2011-11-08 16:53:59 +00:00
Sergey Sharybin
f26d7010ef Don't compile AUD_JOSResampleReaderCoeff.cpp twice (it's included in AUD_JOSResampleReader.cpp) 
Patch from nico_ga, thanks!
 2011-11-08 16:24:31 +00:00
Sergey Sharybin
58f3503e90 Fix #29201: movie clip editor - right click crashes blender 
Just another not very smart check for "boundary" case of usecase.
 2011-11-08 16:09:20 +00:00
Antony Riakiotakis
bf7b3efb18 *Correct syntax for static, since we invoke g++ as linker and we have to pass it to ld. 
*CMakefile: Update boost and OpenImageIO libraries for MinGW like in the cycles branch
 2011-11-08 16:03:28 +00:00
Antony Riakiotakis
d8ecac6126 Correct syntax for static, since we invoke g++ as linker and we have to pass it to ld 2011-11-08 16:02:34 +00:00
Sergey Sharybin
c0f65b774e Fix #29198: Problem with text interface when you enable the International fonts 
Not sure why, but doing the same things as in script from FontForge UI, there's
no issues described in report. Probably matter of some default settings.
Hope it works now fine for everyone.
 2011-11-08 15:12:41 +00:00
Campbell Barton
ce462fa1b7 - disable undo for user preferences (every click would do push an undo), was noticeable on large files. 
- also netbeans project file generator now uses branch name for project.
 2011-11-08 15:11:27 +00:00
Antony Riakiotakis
354ebeadc8 Cycles now uses correct libs on MinGW 2011-11-08 14:47:03 +00:00
Brecht Van Lommel
a56c6e18a8 Cycles: 
* Disable precompiled cuda binaries, always do at run time
* Change preview samples default to 10
* Hide volume panels since they don't do anything yet
 2011-11-08 14:10:33 +00:00
Sergey Sharybin
62988d6311 Attempt to fix #29200: Camera Tracking Solver 
It was an mistake in join tracks operator which lead to reading unitialized memory.
 2011-11-08 14:03:16 +00:00
Brecht Van Lommel
28ee0f9218 Texturing: texture and 3d view draw type changes, these should only have any 
effect for a render engine using new shading nodes. In short:

* No longer uses images assigned to faces in the uv layer, rather the active
  image texture node is what is edited/painted/drawn.
* Textured draw type now shows the active image texture node, with solid
  lighting.
* Material draw mode shows GLSL shader of a simplified material node tree,
  using solid lighting.
* Textures for modifiers, brushes, etc, are now available from a dropdown in
  the texture tab in the properties editor. These do not use new shading nodes
  yet.

http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
 2011-11-08 13:07:16 +00:00
Brecht Van Lommel
19df3147f6 Fix for last fix, guess this compiled ok because it's interpreted as a goto label. 2011-11-08 12:58:03 +00:00
Jens Verwiebe
27d29e2998 Fix an issue with uninitialized memory 2011-11-08 12:44:57 +00:00
Brecht Van Lommel
64ab414026 Cycles: svn merge -r41627:41650 ^/trunk/blender 2011-11-08 12:33:17 +00:00
Brecht Van Lommel
db75cc4cde Nodes: add cycles shader nodes, these will only be available to render engines 
that use the new shading nodes system. Documentation:

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes
 2011-11-08 11:38:16 +00:00
Brecht Van Lommel
ee6f269cda Code cleanup: fix compile warning. 2011-11-08 11:15:40 +00:00
Brecht Van Lommel
e06f206450 Fix: incorrect use of IFACE_ macro, and correct a typo. 2011-11-08 11:02:57 +00:00
Sergey Sharybin
e0030d6c1c - Fixed typo in KLT description tooltip 
- Fixed inconsistent data type used for pts number in ffmpeg_fetchibuf
  and stored in timecode structure. Not really issue for "correct" movie files,
  but probably can help for "broken" one
 2011-11-08 10:17:50 +00:00
Sergey Sharybin
d1067a2711 Fix a typo in building undistorted proxies for movie clips. 
Thanks Campbell to point on this issue.
 2011-11-08 09:34:43 +00:00
Campbell Barton
be5ef51b73 use some more logical BLI math functions & tracking used INT_MAX on a short. 2011-11-08 09:02:47 +00:00
Tamito Kajiyama
80e398e7b2 Merged changes in the trunk up to revision 41638. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
 2011-11-08 06:30:02 +00:00
Sergey Sharybin
23dfb8a156 Code cleanup and small fixes: 
- Assume all areas are using valid MovieClipUser when using functions from movieclip.c
- Set active scene clip to movie-related nodes in compositor rather than checking
  if there's only one clip in datablocks
- Fixed users count issue when solving camera motion
 2011-11-08 06:11:23 +00:00
Thomas Dinges
e28d0c6a8f Tracker: 
* Typo fixes for space_clip.py, patch by Mike S on the mailing list.
 2011-11-08 06:10:04 +00:00
Joshua Leung
9962186134 Code cleanup - reshuffling some stuff to avoid buildup of long functions in transform code again 2011-11-08 06:09:16 +00:00
Campbell Barton
f11d5e1953 correct merge error 2011-11-08 05:33:43 +00:00
Campbell Barton
cb890a49fb svn merge ^/trunk/blender -r41602:41638 . 2011-11-08 02:57:28 +00:00
Campbell Barton
f086201518 cmake & pep8 tidy up, also some style edits. 
remove unneeded collection length function.
 2011-11-08 01:32:34 +00:00
Joseph Eagar
aea95c7860 bmesh: fixed merge issues with navmesh (though I've not tested if it works yet). 
also fixed a small crasher in bridge.
 2011-11-08 00:20:50 +00:00
Guillermo S. Romero
95948d0e0e SVN maintenance. 2011-11-07 23:50:12 +00:00
Brecht Van Lommel
cd191b7d17 UI/Nodes: templates to edit nodes from the properties editor using a tree view, 
to be used by cycles. For testing there's a panel in the node editor if you set
debug to 777, didn't enable it because I'm not sure it's very useful there.
 2011-11-07 22:28:49 +00:00
Brecht Van Lommel
be23090aae Nodes: add foreach_nodeclass iterator over node classes, use for node add menu. 2011-11-07 22:14:48 +00:00
Bastien Montagne
6981e68c92 Fix [#29194] Spelling error 
(yes sir, it is a bugfix :P ).
 2011-11-07 19:25:13 +00:00
Sergey Sharybin
ae06ebcd95 Hopefully compilation with MinGW will work again. 
Tested with official MinGW and SCons, not sure how ti check it when using CMake.
 2011-11-07 18:14:50 +00:00
Brecht Van Lommel
f3407e7d60 Textures/Shaders: extend TexMapping to include projection options, and add a 
ColorMapping struct for color manipulation of textures. These will be the
standard built-in texture node options for manipulating the incoming texture
coordinate and outgoing color.
 2011-11-07 17:35:20 +00:00
Brecht Van Lommel
4487318348 Nodes: add socket option to hide the default value in the UI, to be used for 
sockets that get their default value if no node is connected from elsewhere,
e.g. a texture coordinate.
 2011-11-07 17:30:52 +00:00
Brecht Van Lommel
dca15b215d Cycles: svn merge -r41613:41627 ^/trunk/blender 2011-11-07 17:13:32 +00:00
Brecht Van Lommel
69ad40f9ea Revert fix for #29146, needs deeper changes to solve this fully. 2011-11-07 17:07:54 +00:00
Miika Hamalainen
edec46b0a6 Merge with trunk r41625 2011-11-07 16:36:49 +00:00
Brecht Van Lommel
4d7a9e5c05 RNA: 
* Expose 3D view camera zoom and offset, needed if you want to precisely
  reconstruct camera parameters.
* Rename SpaceFileBrowser.operator to active_operator, to avoid conflict
  with c++ keyword.
 2011-11-07 16:26:53 +00:00
Campbell Barton
9ced8a23fe quiet warnings when building without libmv 2011-11-07 16:26:23 +00:00
Campbell Barton
9de67a61aa fix for error in own recent commit. 2011-11-07 15:57:52 +00:00
Campbell Barton
1d225c6696 use macro for access to library filepath 2011-11-07 15:55:03 +00:00
Brecht Van Lommel
a6828b9c6f CMake: add delayed_install macro to specify files to be installed from modules 
other than source/creator.
 2011-11-07 15:53:40 +00:00
Brecht Van Lommel
b06db617a0 CMake: Boost and OpenImageIO building support (unused still). 2011-11-07 15:44:09 +00:00
Campbell Barton
0b82cef03f fix for error using freed memory 2011-11-07 15:41:20 +00:00
Sergey Sharybin
a3e5bd02bb Some small fixed for camera tracking: 
- Lock to selection and center to selection will now work fine with undistorted rendering
- Do not display pyramid for disabled tracks
- Corrected fix for wrong correlation_min property name
 2011-11-07 15:32:32 +00:00
Brecht Van Lommel
5ef9039b7e Cycles: svn merge -r41531:41613 ^/trunk/blender 2011-11-07 15:23:08 +00:00
Campbell Barton
9b5652215a minor warning nicer api use 2011-11-07 15:19:26 +00:00
Thomas Dinges
50ef1b14e4 Tracker/Movie Clip Editor: 
* Fix property not showing up: correlation_min, was actually called minimum_correlation in RNA.
 2011-11-07 15:19:13 +00:00