griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
39,234 Commits 1 Branch 0 Tags
00bb315f4d8a00c083147c05e07634e09bdd7244
Commit Graph

32421 Commits

Author SHA1 Message Date
Sergey Sharybin
00bb315f4d Merging r47677 through r47683 from trunk into soc-2011-tomato 2012-06-10 16:09:03 +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
Sergey Sharybin
fee1db86d3 Merging r47674 through r47676 from trunk into soc-2011-tomato 2012-06-10 12:37:41 +00:00
Sergey Sharybin
189f16362d Merging r47669 through r47673 from trunk into soc-2011-tomato 2012-06-10 12:33:30 +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
Sergey Sharybin
00e05f1ade Merging r47667 through r47668 from trunk into soc-2011-tomato 2012-06-10 12:19:14 +00:00
Sergey Sharybin
8d5a43dd80 Merging r47662 through r47666 from trunk into soc-2011-tomato 2012-06-10 12:15:39 +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
Sergey Sharybin
f06f1878c2 Merging r47624 through r47661 from trunk into soc-2011-tomato 2012-06-10 09:44:26 +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
Sergey Sharybin
a8bae06dc4 Looks like some kind of merge error happened here which i didn't notice. Corrected! 2012-06-09 18:26:26 +00:00
Campbell Barton
c6cffe98fa code cleanup: removed/renamed shadow & duplicate variable definitions. 2012-06-09 18:20:40 +00:00
Sergey Sharybin
1acd2c58b6 Actually that was an error in on of test formulas. Stick back to original one. 2012-06-09 18:19:41 +00:00
Sergey Sharybin
6b13203a9c Changes to keying nodes: 
- Replace FastGaussian blur with GaussianBokeh blur which should give better results.
- Changes a bit formula of saturation which in some cases gives better result.
  Also included (commented out) original formula which was also checked by Brecht
  and which gave better result in some other cases.
- Made clipping white/black temporal dependent, so hopefully it wouldn't destroy
  gradients on edges.
 2012-06-09 17:15:38 +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
Sergey Sharybin
5fe661792c Fixed crash in previous commit when track preview is drawing for missed frame 2012-06-09 11:34:22 +00:00
Sergey Sharybin
039acbbfef Homography correction for track preview widget 
Use homography transformation for pattern displayed in track preview widget.
Sampling of this pattern happens to resolution of preview widget itself,
which implied some bigger changes in how scopes are working:

- Instead of real pattern store search area in BKE_movieclip_update_scopes,
  which is later used for sampling pattern.
- Sampling of pattern happens in ui_draw_but_TRACKPREVIEW from search area
  which allows to sample it to actual resolution of preview widget.
- If size of preview widget is not changing, this sampled pattern wouldn't
  be re-sampled until scopes are tagged to update.

There are some issues with pattern sampling which seems to happen SamplePlanarPatch,
changing linear sampling to nearest removes that unwanted 1px offset.

Left commented saving of sampled image in ui_draw_but_TRACKPREVIEW which should
help figuring the issue out.
 2012-06-09 11:14:36 +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
5728b11ef2 Merging r47612 through r47623 from trunk into soc-2011-tomato 2012-06-08 18:25:01 +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
511ee1175a svn merge ^/trunk/blender -r47603:47611 2012-06-08 14:49:07 +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
Sergey Sharybin
26f9fe3962 Merging r47581 through r47603 from trunk into soc-2011-tomato 2012-06-08 09:36:17 +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