griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
38,985 Commits 1 Branch 0 Tags
39e591d3d04015b84fe5f12e7ef5af6507df92af
Commit Graph

32214 Commits

Author SHA1 Message Date
Sergey Sharybin
39e591d3d0 Support for per-track Grease Pencil datablocks for motion tracking 
Originally was needed to reach easy way of defining masks used for tracking
(do eliminate textures which doesn't belong to feature when tracking.

Implemented as alternative to GP datablock for clip and added switch between
per-clip and per-track GP datablocks -- internal limitations of GP doesn't
allow to display all GP datablocks easily.  So either you see.edit GP associated
with clip or with track.

GP strokes associated with track are relative to track's position, following
tracks during tracking and could be shared between several tracks.

Masking code presents in libmv and there's rasterizer of GP datablocks for
masks in blender's tracking module, but they still need to be glued together.

Some documentation cound be found at this page:

http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Motion_Tracker#Grease_Pencil
 2012-06-10 15:26:50 +00:00
Campbell Barton
5534701e5d style cleanup: use capital camel case names for typedef's 2012-06-10 15:20:10 +00:00
Lukas Toenne
10932e2e97 Fix #31778. BKE_image_user_frame_calc can be called with iuser==NULL in some circumstances now, so needs to check that. 2012-06-10 15:07:08 +00:00
Campbell Barton
f6e21881f5 change RNA_struct_find_function to accept a type rather then a PointerRNA, add a check duplicate functions are not defined. 2012-06-10 13:34:59 +00:00
Campbell Barton
219eca0f51 mango request - add alpha to histogram & sample line. 2012-06-10 12:33:27 +00:00
Lukas Toenne
7496a58cfb Applied and completed a compositor patch by Brecht to use signalling and waiting in scheduling and worker threads instead of continuous loops with sleep times. This should help reduce unnecessary wait times in Tile. 2012-06-10 12:26:33 +00:00
Campbell Barton
5e29381825 mango request 
- optionally display the histogram as lines (not filled areas).
- expand the enum for faster access.
- keep the sample line displayed after doing the line sample (running again clears).
 2012-06-10 12:09:25 +00:00
Campbell Barton
6ba5650428 code cleanup: rename flag --> dflag (draw flag), since this is overly generic name and was passed about to many functions. 2012-06-10 10:15:49 +00:00
Lukas Toenne
18a966293e Fix for Tile group nodes with internally unconnected outputs, this was crashing due to missing constant value operations for such outputs. The SocketProxyNode now checks connection of the input socket on conversion, so this also simplifies usage of proxy nodes quite a bit. 2012-06-10 09:30:31 +00:00
Campbell Barton
6e9e758d60 fix for un-initialized memory use for modal inset/bevel. 2012-06-10 09:05:49 +00:00
Sergey Sharybin
bdc10e7b41 Missed NULL-pointer checks in poll some functions 2012-06-10 09:04:49 +00:00
Lukas Toenne
945cc4651a Fix for compositor image node draw function. The image user pointer needs to be constructed explicitly from the node storage pointer. 2012-06-10 07:51:57 +00:00
Lukas Toenne
0586705b63 Fix #31747, broken image sequence loading after r47432. 
The image file name function was updating the iuser->framenr using a supposed cfra parameter. However, the actual cfra is unknown when loading movies or sequences, so the iuser->framenr value itself was passed in its place, leading to incremental addition of the iuser frame offset. Removed the cfra parameter altogether from the image path function. This should instead be done separately if necessary, it's not an inherent part of constructing the image file name.
 2012-06-10 07:35:45 +00:00
Dan Eicher
02bcba341d OBJECT_OT_drop_named_material -- missing notifier for material panel UI update 2012-06-09 21:43:22 +00:00
Campbell Barton
8e7d7d5ea5 code cleanup: reduce float/double promotion 2012-06-09 19:57:14 +00:00
Campbell Barton
c6cffe98fa code cleanup: removed/renamed shadow & duplicate variable definitions. 2012-06-09 18:20:40 +00:00
Campbell Barton
2f60d9b0b9 fix for un-handled exception when entering in multiple values to a button, floats were not correctly checked for. 2012-06-09 16:45:42 +00:00
Campbell Barton
56c5c63f57 code cleanup: doxy comment filename corrections 2012-06-08 23:43:11 +00:00
Campbell Barton
c96c63ad3a add a utility function to get an exact match for a grease pencil frame. 2012-06-08 22:07:57 +00:00
Dan Eicher
a8e0011c96 rna_SequenceElements_pop --> use memcpy instead of strcpy 2012-06-08 22:05:26 +00:00
Campbell Barton
2f5612ba33 code cleanup: name mask and grease pencil dope sheet editor functions more consistantly 2012-06-08 21:48:04 +00:00
Dalai Felinto
dfa307f73f constraints names are not matching (rna and constraint.c). doing rna->constraint.c 2012-06-08 21:04:48 +00:00
Mitchell Stokes
8a4f16739a Fixing a BGE bug where textures could get loaded into VRAM twice. 2012-06-08 19:57:28 +00:00
Sergey Sharybin
73a47caa08 Fixed issue with missed reconstruction error in clip editor header 
Actually was causes by error in RNA bindings which lead to empty reconstruction
returned for cameraObject.reconstruction.
 2012-06-08 18:16:20 +00:00
Sergey Sharybin
916524d650 Fixed issue with non-updating frame in clip editor when toggling undistorted render while frame is grayscaled. 
Also corrected some typos in movieclip.
 2012-06-08 17:16:32 +00:00
Sergey Sharybin
ff792f3249 Selecting track channel in tracking dopesheet would make track active, 
just as it happens with curve view.
 2012-06-08 16:51:38 +00:00
Sergey Sharybin
04766ab071 Added sorting by average reprojection error to motion tracking dopesheet. 2012-06-08 16:42:24 +00:00
Lukas Toenne
5e1bbde01d Particle Info node for Cycles. This can be used to access particle information in material shaders for dupli objects. For now only the particle Age and individual Lifetime (in frames) are supported, more attributes can be added when needed. 
The particle data is stored in a separate texture if any of the dupli objects uses particle info nodes in shaders. To map dupli objects onto particles the store an additional particle_index value, which is different from the simple dupli object index (only visible particles, also works for particle dupli groups mode).

Some simple use cases on the code.blender.org blog:
http://code.blender.org/index.php/2012/05/particle-info-node/
 2012-06-08 16:17:57 +00:00
Sergey Sharybin
909752a3da Fix #31752: Select All By Layer seems not to work when object belongs to several layers 
Added option which changes match policy from exact match and shared layers when
selecting objects by layer.
 2012-06-08 15:14:45 +00:00
Campbell Barton
5f2409e5ec add listener in action space for mask changes so dopesheet redraws + other minor changes. 2012-06-08 14:46:17 +00:00
Campbell Barton
b33c5168f4 mask animation keys now editable in the dope sheet (duplicate, transform, delete, select- etc). 2012-06-08 14:31:38 +00:00
Antony Riakiotakis
68c365e2f0 Index: source/blender/gpu/intern/gpu_draw.c 
===================================================================
--- source/blender/gpu/intern/gpu_draw.c	(revision 47568)
+++ source/blender/gpu/intern/gpu_draw.c	(working copy)
@@ -230,11 +230,12 @@
 	Image *ima, *curima;
 
 	int domipmap, linearmipmap;
+	int texpaint; /* store this so that new images created while texture painting won't be set to mipmapped */
 
 	int alphablend;
 	float anisotropic;
 	MTFace *lasttface;
-} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, -1, 1.f, NULL};
+} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, 0, -1, 1.f, NULL};
 
 /* Mipmap settings */
 
@@ -256,7 +257,7 @@
 
 static int gpu_get_mipmap(void)
 {
-	return GTS.domipmap;
+	return GTS.domipmap && !GTS.texpaint;
 }
 
 static GLenum gpu_get_mipmap_filter(int mag)
@@ -730,6 +731,8 @@
 	if (!GTS.domipmap)
 		return;
 
+	GTS.texpaint = !mipmap;
+
 	if (mipmap) {
 		for (ima=G.main->image.first; ima; ima=ima->id.next) {
 			if (ima->bindcode) {
 2012-06-08 13:06:06 +00:00
Campbell Barton
477d12d1fc fix for bug in point slide using freed memory when auto-keying. 2012-06-08 09:57:23 +00:00
Campbell Barton
4413903370 support for subframe animation evaluation for masks. 2012-06-08 09:35:51 +00:00
Campbell Barton
ae3062b741 fix for own bug - evaluating past the last frame of a mask didnt work at all. 2012-06-08 09:27:40 +00:00
Jeroen Bakker
de7fe937ff * Added OpenCL kernel for bokeh blur 
* Uncomment COM_OPENCL_ENABLED from COM_defines.h to test
 2012-06-08 09:17:07 +00:00
Sergey Sharybin
9564138847 Another fix for #31743: check for DM's verts number matches passed number of vertices 
Now bevelled splines shall work in the same way as meshes.
 2012-06-08 09:15:45 +00:00
Sergey Sharybin
e446c6af1f Fix #31748: Blender crashes when typing "al" after opening spacebar menu. 
Crash was introduced by own refactoring of poll functions in clip editor.
 2012-06-08 08:24:08 +00:00
Sergey Sharybin
87211a49ab Fix #31743: Applying Smooth modifier to a curve crashes Blender 
Actually there were two different issues involved here:

- Recently enabled Smooth modifier wasn't actually designed for curves, so
  it in fact requires a bit bigger work to make it working.

  For now added check for object's typy in this modifier and if it's not
  mesh, it wouldn't try to use edges.

  The reason why it worked in 3d viewport is that creating DM from curve while
  displist is still ocntrcuting for would result in empty CDDM and that leads to
  not taking edges into account, only vertexCos passed to modifier would be used.

  This makes it behaving a bit differently from if it was a mesh, but still gives
  quite reasonable result. Would leave actual fix for a guy who enabled smooth
  modifier.

- Another issue is related on ensuring sculpt mask layer after applying modifier.
  This shall happen only for meshes.
 2012-06-08 08:17:34 +00:00
Sergey Sharybin
fc07b1fce3 Mask editing: remove use_parent property and use check if paren't id is set instead 2012-06-08 07:54:46 +00:00
Campbell Barton
b0c868c3b3 number enums 2012-06-08 06:11:24 +00:00
Campbell Barton
0593651165 code cleanup: assign values to enums in DNA 2012-06-08 06:04:29 +00:00
Campbell Barton
26ca0008ee typo/style edits 2012-06-08 05:53:30 +00:00
Campbell Barton
a6f3e15d6e - remove redundant NULL checks from mallocn's local linked list functions. 
- minor changes to warning cleanup.
 2012-06-08 05:46:00 +00:00
Campbell Barton
36db2a2cff initial support for editing masks in the sequencer, currently only draw the mask. 2012-06-07 19:24:49 +00:00
Campbell Barton
186f542b79 remove casts to short when allocating new imbufs. 2012-06-07 18:33:36 +00:00
Campbell Barton
bdf9e02346 new sequence strip type for masks. 2012-06-07 18:24:36 +00:00
Bastien Montagne
32530c2827 Quite some warnings... 2012-06-07 18:21:07 +00:00
Sergey Sharybin
1c46e63d4d Tooltips shouldn't have dot at the end of sentence 2012-06-07 18:10:25 +00:00
Sergey Sharybin
fd271f34fe Remove unused ibuf argument from draw_gpencil_2dimage 
It was used by sequencer only and it wasn't ported for a while already.
This change allows to save cahce lookup for image and clip editors.
 2012-06-07 17:57:49 +00:00