griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,616 Commits 1 Branch 0 Tags
da170d9dc3dd84f1b77f737a94d5863b0d67dd21
Commit Graph

47594 Commits

Author SHA1 Message Date
Sergey Sharybin
667e7ab348 Correction to one of previous commits 2012-08-12 18:24:01 +00:00
Daniel Genrich
94ef519b79 Fix own mistake: Space got stripped before path 2012-08-12 18:01:27 +00:00
Daniel Genrich
f4117f5b72 El Topo: Fix missing includes (Scons + Cmake) 2012-08-12 17:56:52 +00:00
Campbell Barton
61eacb534e inpaint node now blend inpaint pixels with existing alpha, this makes soft alpha blends inpaint look nicer. 
also dont assign 1.0 alpha for parts of the image not inpaint'ed, this way you can maintain some alpha in the image.
 2012-08-12 17:31:42 +00:00
Gaia Clary
10004d4a42 fixed: [#32240] Collada import when nodes share geometry but not material 2012-08-12 17:13:07 +00:00
Gaia Clary
3ebbfe2c40 new parameter in assign_material() to specify where material shall be assigned: object, obdata, by userpref(default) (as discussed with ideasman_42) 2012-08-12 17:12:07 +00:00
Campbell Barton
b2fdb3f50e avoid divide by zero for the inpaint node. 2012-08-12 17:10:56 +00:00
Campbell Barton
5b678016c3 fix for own error in datatoc.c - data wasn't NULL terminated, in some cases this is expected (broke GLSL shaders). 2012-08-12 16:51:51 +00:00
Peter Schlaile
bd71fb6d1d == Inpaint Node == 
Fixed several small (stupid) issues with the inpaint node:

* on pixel order building, some ranges got wrong and origin was considered
  several times.

* the convolution kernel didn't consider all pixels (+1,0),(-1,0),(0,1) and (0-1)
  were omited, leading to suboptimal results (sometimes even black areas)

* alpha channel is now only affected an areas considered by inpaint.
  That's only important, if you choose low iteration counts.
 2012-08-12 15:59:40 +00:00
Campbell Barton
32254596d4 replace ELEM8(gs, ID_ME, ID_CU, ID_MB, ID_LT, ID_LA, ID_CA, ID_TXT, ID_SPK) with macro: OB_DATA_SUPPORT_ID() 2012-08-12 14:57:19 +00:00
Sergey Sharybin
8d59fa4e40 Merging r49834 through r49839 from trunk into soc-2011-tomato 2012-08-12 13:38:46 +00:00
Sergey Sharybin
82688e61fc Sequencer: free cache used by sequence when removing strip 
Before this removing and adding new strip could have been lead
into situations when new sequence would use old cache.
 2012-08-12 13:29:57 +00:00
Sergey Sharybin
51fafdee0c Sequencer: overlay display type options 
Before this overlay would happen only for defined rectangle area,
now it's possible to show current / reference frames only, which
makes it possible to do more real slit view involving even displaying
frames on different monitors.

Still some work need to be done to clean interface up and support
displaying color information for reference shot.
 2012-08-12 13:24:29 +00:00
Sergey Sharybin
ed564d7cb7 NDOF navigation support for clip editor 2012-08-12 12:15:23 +00:00
Sergey Sharybin
711b97c2ac Tomato Cycles: use actual number of tiles for viewport rendering 
Before this debug_tile_size was used as a size of tile, which
became hidden property since tile-based rendering implementation
and couldn't have been controlled.

This resolves the issue with single thread used for viewport
rendering in some cases. Also it makes possible to control tiles
for CUDA viewport rendering, which still behaves much faster when
using the single tile.

Also fixed issue with minimal tile size which was used to calculate
divider of final resolution to be used for initial rendering. Now
it's a Resolution Divider property in Performance tab. This option
could be used to tweak initial resolution of viewport for faster
navigation or faster refresh when changing some properties.
 2012-08-12 11:58:34 +00:00
Sergey Sharybin
8aeba8ec8b Merging r49815 through r49833 from trunk into soc-2011-tomato 2012-08-12 10:07:55 +00:00
Sergey Sharybin
0716a85e53 Fix sequencer crash when invalidating strip when there's nothing cached yet 2012-08-12 09:37:51 +00:00
Campbell Barton
9cce2d8645 smooth-view for 2d views, graph editor, sequencer, node view, works with border zoom, view selected, view all. 2012-08-12 01:07:31 +00:00
Tamito Kajiyama
44e4c5f831 Merged changes in the trunk up to revision 49797. 2012-08-12 00:09:57 +00:00
Campbell Barton
b96c622015 style cleanup 2012-08-11 22:12:32 +00:00
Campbell Barton
c567cf3fab code cleanup: WM naming conventions 2012-08-11 21:35:24 +00:00
Campbell Barton
823083a744 fix for own error with opencl bokeh blur. 2012-08-11 18:47:09 +00:00
Campbell Barton
df1dd658c9 minor improvements to cmake's datatoc usage, now changes to datatoc.c re-make generated files. 2012-08-11 18:39:38 +00:00
Sergey Sharybin
364f8cc1ea Merging r49808 through r49814 from trunk into soc-2011-tomato 2012-08-11 18:25:45 +00:00
Campbell Barton
ca7c07cda9 add back datatoc, use this instead of cmake script which was too slow. 2012-08-11 16:25:31 +00:00
Sergey Sharybin
35ef09372a Fix #32306: Applying location or rotation scales sculpt data 2012-08-11 16:20:30 +00:00
Campbell Barton
b97fc46abc remove all remaining data files from source, now all are converted at build time. 
note: this is currently very slow in cmake, will address this next.
 2012-08-11 15:24:31 +00:00
Campbell Barton
90f443bb86 generate brush icons C files at build time. 2012-08-11 14:40:09 +00:00
Sergey Sharybin
00afee41c8 Merging r49775 through r49807 from trunk into soc-2011-tomato 2012-08-11 14:39:09 +00:00
Sergey Sharybin
2be39776d5 Style cleanup: whitespace and line breaks 2012-08-11 14:38:02 +00:00
Sergey Sharybin
a794e19346 Sequencer: support for masked color balance 
This implements option which could be used to color balance only
specified area. Currently done by adding Mask input to Adjustment
effect. Affects on color balance and multiply settings.

Supporting masked saturation control is in the list, not supported
in this commit.

Also show value slider in the right of color wheel.
 2012-08-11 14:37:58 +00:00
Campbell Barton
be4ae581ff simplified data_to_c macro in cmake 2012-08-11 13:32:19 +00:00
Campbell Barton
81272e28a0 generate glsl shaders c files at build time. 2012-08-11 13:01:44 +00:00
Campbell Barton
5f341a846b startup.blend and preview.blend are now converted to C at build time. 
made some changes to startup.c
- change default player to internal since its working now.
- added new screen for full screen 3d viewport (nice for demo's and navigating)
- disable cursor depth option (was enabled by default because of re-used flag)
 2012-08-11 12:26:43 +00:00
Campbell Barton
51182bc78d add MEM_recallocN(), so bytes are ensured to be zero'd when growing. 2012-08-11 12:16:09 +00:00
Sergey Sharybin
0682c3f1ae Code cleanup and minor change to CMake's colalda detection to make 
it detect directory structure used for libs in our svn (<root>/include/<component>/include)
 2012-08-11 10:32:27 +00:00
Campbell Barton
fdc5e4f5a6 docs for window structs 2012-08-11 01:05:09 +00:00
Campbell Barton
b8b7e5d137 fix for minor UI annoyance - when the window is fullscreen now dont draw area corners since areas cant be split when fullscreen. 2012-08-11 00:05:57 +00:00
Campbell Barton
8d641ebf56 svn merge ^/trunk/blender -r49763:49774 2012-08-10 15:45:09 +00:00
Campbell Barton
b84c1dd592 compositor: bokeh blur size input can now be an image, in this case it uses VariableSizeBokehBlurOperation class internally. 
updated opencl too.
 2012-08-10 15:31:54 +00:00
Sergey Sharybin
2a1b7f7f8e Fix infinite recursion when using adjustment strip placed to channel 1 2012-08-10 15:30:38 +00:00
Campbell Barton
94a3945cf9 code cleanup: compositor - define size for executePixel function output float array 2012-08-10 14:07:24 +00:00
Campbell Barton
e877247789 use define for bokeh blur size, also define size of determineResolution args. 2012-08-10 13:23:31 +00:00
Sergey Sharybin
fea0e60227 Fix building with audaspace disabled 2012-08-10 12:56:09 +00:00
Campbell Barton
4f1b0e473b add asserts in MemoryBuffer.readNoCheck() so it raises an error when used incorrectly in debug mode. 2012-08-10 12:38:53 +00:00
Campbell Barton
bec90b40c3 fix [#32289] Border Zoom, Zoom Border or Zoom to Border? 
pedantic report but may as well name them the same.
 2012-08-10 11:43:53 +00:00
Campbell Barton
c8cdad1748 fix [#32300] Convex Hull Poll Shouldn't Require 3D View 2012-08-10 11:38:52 +00:00
Campbell Barton
bfbea03228 svn merge ^/trunk/blender -r49757:49763 2012-08-10 10:37:31 +00:00
Campbell Barton
6a1a5ad08b split off auto depth option to have cursor placement use depth too since you dont always want both. 2012-08-10 10:34:24 +00:00
Campbell Barton
3c35f560db minor compositor change: use the max dimension for bokeh blur size, rather then width. 2012-08-10 10:20:28 +00:00