[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57321] branches/soc-2013-dingto: SVN merge r57315-57319 into soc-2013-dingto
Thomas Dinges
blender at dingto.org
Sun Jun 9 22:28:17 CEST 2013
Revision: 57321
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57321
Author: dingto
Date: 2013-06-09 20:28:16 +0000 (Sun, 09 Jun 2013)
Log Message:
-----------
SVN merge r57315-57319 into soc-2013-dingto
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57315
Modified Paths:
--------------
branches/soc-2013-dingto/doc/guides/interface_API.txt
branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_random.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/blender.c
branches/soc-2013-dingto/source/blender/editors/include/UI_interface.h
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_intern.h
branches/soc-2013-dingto/source/blender/editors/interface/interface_regions.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_utils.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-dingto/source/blender/editors/mesh/editface.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-dingto/source/blender/editors/screen/area.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_screen.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57319
Modified: branches/soc-2013-dingto/doc/guides/interface_API.txt
===================================================================
--- branches/soc-2013-dingto/doc/guides/interface_API.txt 2013-06-09 20:28:08 UTC (rev 57320)
+++ branches/soc-2013-dingto/doc/guides/interface_API.txt 2013-06-09 20:28:16 UTC (rev 57321)
@@ -19,26 +19,22 @@
4. API for uiButton
4.1 UiDefBut
1. BUT
- 2. TOG or TOGN or TOGR
+ 2. TOG or TOGN
TOG|BIT|<nr>
- 3. TOG3|BIT|<nr>
- 4. ROW
- 5. SLI or NUMSLI or HSVSLI
- 6. NUM
- 7. TEX
- 8. LABEL
- 9 SEPR
- 10. MENU
- 11. COL
+ 3. ROW
+ 4. NUMSLI or HSVSLI
+ 5. NUM
+ 6. TEX
+ 7. LABEL
+ 8 SEPR
+ 9. MENU
+ 10. COL
4.2 Icon buttons
- 12. ICONROW
- 13. ICONTEXTROW
4.3 pulldown menus / block buttons
14. BLOCK
4.4 specials
15. KEYEVT
16. LINK and INLINK
- 17. IDPOIN
4.5 uiButton control fuctions
@@ -289,55 +285,49 @@
Activation button. (like "Render")
Passing on a pointer is not needed
-2. TOG or TOGN or TOGR
+2. TOG or TOGN
Toggle button (like "Lock")
The pointer value is set either at 0 or 1
If pressed, it calls the optional function with arguments provided.
Type TOGN: works negative, when pressed it sets at 0
- Type TOGR: is part of a row, redraws automatically all buttons with same *poin
"|BIT|<nr>"
When added to type, it works on a single bit <nr> (lowest order bit: nr = '0')
-3. TOG3|BIT|<nr>
- A toggle with 3 values!
- Can be only used for short *poin.
- In the third toggle setting, the bit <nr> of *( poin+1) is set.
-
-4. ROW
+3. ROW
Button that's part of a row.
in "min" you set a row-id number, in "max" the value you want *poin to be
assigned when you press the button. Always pass on these values as floats.
When this button is pressed, it sets the "max" value to *poin, and redraws
all buttons with the same row-id number.
-5. SLI or NUMSLI or HSVSLI
- Slider, number-slider or hsv-slider button.
+4. NUMSLI or HSVSLI
+ Number-slider or hsv-slider button.
"min" and "max" are to clamp the value to.
If you want a button type "Col" to be updated, make 'a1' equal to 'retval'
from the COL button.
-6. NUM
+5. NUM
Number button
Set the clamping values 'min' and 'max' always as float.
For UiDefButF, set a 'step' in 'a1', in 1/100's. The step value is the increment or
decrement when you click once on the right or left side of a button.
The optional button function is additionally called for each change of the *poin value.
-7. TEX
+6. TEX
Text string button.
Pointertype is standard a char. Value 'max' is length of string (pass as float).
When button is left with ESC, it doesn't put the 'retval' at the queue.
-8. LABEL
+7. LABEL
Label button.
Only displays text.
If 'min' is set at 1.0, the text is printed in white.
-9 SEPR
+8 SEPR
A separator line, typically used within pulldown menus.
-10. MENU
+9. MENU
Menu button.
The syntax of the string in *name defines the menu items:
- %t means the previous text becomes the title
@@ -346,7 +336,7 @@
without returnvalues, the first item gets value 0 (incl. title!)
Example: "Do something %t| turn left %2| turn right %1| nothing %0"
-11. COLOR
+10. COLOR
A special button that only visualizes a RGB value
In 'retval' you can put a code, which is used to identify for sliders if it needs
redraws while using the sliders. Check button '5'.
@@ -371,20 +361,7 @@
Same again, but now with an icon and string as button name.
-Two special icon buttons are available in Blender:
-12. ICONROW
- (uiDefIconBut)
- This button pops up a vertical menu with a row of icons to choose from.
- 'max' = amount of icons. The icons are supposed to be ordered in a sequence
- It writes in *poin which item in the menu was choosen (starting with 0).
-
-13. ICONTEXTROW
- (uiDefIconTextBut)
- Same as previous, but with the texts next to it.
-
-
-
-----------4.3 pulldown menus / block buttons
14. BLOCK
@@ -465,37 +442,6 @@
-17. IDPOIN
-void uiDefIDPoinBut(uiBlock *block, uiIDPoinFuncFP func, int retval, char *str,
- short x1, short y1, short x2, short y2, void *idpp, char *tip)
-
- The ID struct is a generic part in structs like Object, Material, Mesh, etc.
- Most linking options in Blender happens using ID's. (Mesh -> Material).
-
- This special button in Blender visualizes an ID pointer with its name. Typing in
- a new name, changes the pointer. For most ID types in Blender functions have been
- written already, needed by this button, to check validity of names, and assign the pointer.
-
- (BTW: the 'void *idpp' has to be a pointer to the ID pointer!)
-
- Example function that can be put in 'func':
-
- void test_scriptpoin_but(char *name, ID **idpp)
- {
- ID *id;
-
- id= G.main->text.first;
- while(id) {
- if( strcmp(name, id->name+2)==0 ) {
- *idpp= id;
- return;
- }
- id= id->next;
- }
- *idpp= 0;
- }
-
-
------------- 4.5 uiButton control fuctions
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp 2013-06-09 20:28:08 UTC (rev 57320)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp 2013-06-09 20:28:16 UTC (rev 57321)
@@ -211,7 +211,6 @@
void BlenderSync::sync_film()
{
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
- BL::WorldMistSettings b_mist = b_scene.world().mist_settings();
Film *film = scene->film;
Film prevfilm = *film;
@@ -220,19 +219,23 @@
film->filter_type = (FilterType)RNA_enum_get(&cscene, "filter_type");
film->filter_width = (film->filter_type == FILTER_BOX)? 1.0f: get_float(cscene, "filter_width");
- film->mist_start = b_mist.start();
- film->mist_depth = b_mist.depth();
+ if(b_scene.world()) {
+ BL::WorldMistSettings b_mist = b_scene.world().mist_settings();
- switch(b_mist.falloff()) {
- case BL::WorldMistSettings::falloff_QUADRATIC:
- film->mist_falloff = 2.0f;
- break;
- case BL::WorldMistSettings::falloff_LINEAR:
- film->mist_falloff = 1.0f;
- break;
- case BL::WorldMistSettings::falloff_INVERSE_QUADRATIC:
- film->mist_falloff = 0.5f;
- break;
+ film->mist_start = b_mist.start();
+ film->mist_depth = b_mist.depth();
+
+ switch(b_mist.falloff()) {
+ case BL::WorldMistSettings::falloff_QUADRATIC:
+ film->mist_falloff = 2.0f;
+ break;
+ case BL::WorldMistSettings::falloff_LINEAR:
+ film->mist_falloff = 1.0f;
+ break;
+ case BL::WorldMistSettings::falloff_INVERSE_QUADRATIC:
+ film->mist_falloff = 0.5f;
+ break;
+ }
}
if(film->modified(prevfilm))
Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h 2013-06-09 20:28:08 UTC (rev 57320)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h 2013-06-09 20:28:16 UTC (rev 57321)
@@ -233,7 +233,7 @@
return result;
}
-__device float4 kernel_path_progressive(KernelGlobals *kg, RNG rng, int sample, Ray ray, __global float *buffer)
+__device float4 kernel_path_progressive(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer)
{
/* initialize */
PathRadiance L;
@@ -271,7 +271,7 @@
}
extmax = kernel_data.curve_kernel_data.maximum_width;
- lcg_state = lcg_init(rng + rng_offset + sample*0x51633e2d);
+ lcg_state = lcg_init(*rng + rng_offset + sample*0x51633e2d);
}
bool hit = scene_intersect(kg, &ray, visibility, &isect, &lcg_state, difl, extmax);
@@ -399,7 +399,7 @@
/* do bssrdf scatter step if we picked a bssrdf closure */
if(sc) {
- uint lcg_state = lcg_init(rng + rng_offset + sample*0x68bc21eb);
+ uint lcg_state = lcg_init(*rng + rng_offset + sample*0x68bc21eb);
subsurface_scatter_step(kg, &sd, state.flag, sc, &lcg_state, false);
}
}
@@ -538,7 +538,7 @@
#ifdef __NON_PROGRESSIVE__
-__device void kernel_path_indirect(KernelGlobals *kg, RNG rng, int sample, Ray ray, __global float *buffer,
+__device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer,
float3 throughput, int num_samples, int num_total_samples,
float min_ray_pdf, float ray_pdf, PathState state, int rng_offset, PathRadiance *L)
{
@@ -644,7 +644,7 @@
/* do bssrdf scatter step if we picked a bssrdf closure */
if(sc) {
- uint lcg_state = lcg_init(rng + rng_offset + sample*0x68bc21eb);
+ uint lcg_state = lcg_init(*rng + rng_offset + sample*0x68bc21eb);
subsurface_scatter_step(kg, &sd, state.flag, sc, &lcg_state, false);
}
}
@@ -767,7 +767,7 @@
}
}
-__device_noinline void kernel_path_non_progressive_lighting(KernelGlobals *kg, RNG rng, int sample,
+__device_noinline void kernel_path_non_progressive_lighting(KernelGlobals *kg, RNG *rng, int sample,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list