Commit: 65862c549ec41d20f916bf085dfd7693341fc7bc
Author: Antonio Vazquez
Date: Fri May 11 18:29:25 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB65862c549ec41d20f916bf085dfd7693341fc7bc
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
===================================================================
===================================================================
diff --cc source/blender/editors/space_outliner/outliner_draw.c
index a40b3dc9035,5d981bdad0d..f699e23bc17
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@@ -1149,10 -1128,10 +1150,12 @@@ static void tselem_draw_icon(uiBlock *b
tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_OB_SURFACE); break;
case OB_SPEAKER:
tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_OB_SPEAKER); break;
+ case OB_LIGHTPROBE:
+ tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_OB_LIGHTPROBE); break;
case OB_EMPTY:
tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_OB_EMPTY); break;
+ case OB_GPENCIL:
+ tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_OB_GREASEPENCIL); break;
}
}
else {
@@@ -1228,7 -1207,22 +1231,22 @@@
case ID_LS:
tselem_draw_icon_uibut(&arg,
ICON_LINE_DATA); break;
case ID_GD:
- tselem_draw_icon_uibut(&arg,
ICON_GREASEPENCIL); break;
+ tselem_draw_icon_uibut(&arg,
ICON_OUTLINER_DATA_GREASEPENCIL); break;
+ case ID_LP:
+ {
+ LightProbe * lp = (LightProbe
*)tselem->id;
+ switch (lp->type) {
+ case LIGHTPROBE_TYPE_CUBE:
+
tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_CUBEMAP); break;
+ case LIGHTPROBE_TYPE_PLANAR:
+
tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_PLANAR); break;
+ case LIGHTPROBE_TYPE_GRID:
+
tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_GRID); break;
+ default:
+
tselem_draw_icon_uibut(&arg, ICON_LIGHTPROBE_CUBEMAP); break;
+ }
+ break;
+ }
default:
break;
}
diff --cc source/blender/modifiers/intern/MOD_screw.c
index 897eda2f6b1,629c3c3b0b2..963ac4b6396
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@@ -1148,13 -1151,9 +1151,13 @@@ ModifierTypeInfo modifierType_Screw =
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
/* deformMatricesEM */ NULL,
- /* applyModifier */ NULL,
+ /* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
+
/* initData */ initData,
/* requiredDataMask */ NULL,
/* freeData */ NULL,
diff --cc source/blender/modifiers/intern/MOD_uvproject.c
index dbd99fae278,2087a1f7a1a..f33819300c1
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@@ -341,13 -337,9 +337,13 @@@ ModifierTypeInfo modifierType_UVProjec
/* deformMatrices */ NULL,
/* deformVertsEM */ NULL,
/* deformMatricesEM */ NULL,
- /* applyModifier */ NULL,
+ /* applyModifier */ applyModifier,
/* applyModifierEM */ NULL,
+ /* gp_deformStroke */ NULL,
+ /* gp_generateStrokes */ NULL,
+ /* gp_bakeModifier */ NULL,
+
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,
/* freeData */ NULL,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
